Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f1f9b5e2
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f1f9b5e2
编写于
7月 12, 2016
作者:
P
Paco Guzman
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Be explicit on merge request discussion variables
上级
3ca92534
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
41 addition
and
10 deletion
+41
-10
CHANGELOG
CHANGELOG
+1
-0
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+15
-10
spec/features/merge_requests/diffs_spec.rb
spec/features/merge_requests/diffs_spec.rb
+25
-0
未找到文件。
CHANGELOG
浏览文件 @
f1f9b5e2
...
...
@@ -56,6 +56,7 @@ v 8.10.0 (unreleased)
- Add API endpoint for a group issues !4520 (mahcsig)
- Add Bugzilla integration !4930 (iamtjg)
- Instrument Rinku usage
- Be explicit to define merge request discussion variables
- Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab
- RailsCache metris now includes fetch_hit/fetch_miss and read_hit/read_miss info.
- Allow [ci skip] to be in any case and allow [skip ci]. !4785 (simon_w)
...
...
app/controllers/projects/merge_requests_controller.rb
浏览文件 @
f1f9b5e2
...
...
@@ -56,7 +56,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def
show
respond_to
do
|
format
|
format
.
html
format
.
html
{
define_discussion_vars
}
format
.
json
do
render
json:
@merge_request
...
...
@@ -82,7 +82,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request_diff
=
@merge_request
.
merge_request_diff
respond_to
do
|
format
|
format
.
html
format
.
html
{
define_discussion_vars
}
format
.
json
{
render
json:
{
html:
view_to_html_string
(
"projects/merge_requests/show/_diffs"
)
}
}
end
end
...
...
@@ -108,7 +108,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def
commits
respond_to
do
|
format
|
format
.
html
{
render
'show'
}
format
.
html
do
define_discussion_vars
render
'show'
end
format
.
json
do
# Get commits from repository
# or from cache if already merged
...
...
@@ -123,7 +127,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def
builds
respond_to
do
|
format
|
format
.
html
{
render
'show'
}
format
.
html
do
define_discussion_vars
render
'show'
end
format
.
json
{
render
json:
{
html:
view_to_html_string
(
'projects/merge_requests/show/_builds'
)
}
}
end
end
...
...
@@ -353,14 +361,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request
.
unlock_mr
@merge_request
.
close
end
if
request
.
format
==
:html
||
action_name
==
'show'
define_show_html_vars
end
end
# Discussion tab data is only required on html requests
def
define_show_html_vars
# Discussion tab data is rendered on html responses of actions
# :show, :diff, :commits, :builds. but not when request the data through AJAX
def
define_discussion_vars
# Build a note object for comment form
@note
=
@project
.
notes
.
new
(
noteable:
@noteable
)
...
...
spec/features/merge_requests/diffs_spec.rb
0 → 100644
浏览文件 @
f1f9b5e2
require
'spec_helper'
feature
'Diffs URL'
,
js:
true
,
feature:
true
do
before
do
login_as
:admin
@merge_request
=
create
(
:merge_request
)
@project
=
@merge_request
.
source_project
end
context
'when visit with */* as accept header'
do
before
(
:each
)
do
page
.
driver
.
add_header
(
'Accept'
,
'*/*'
)
end
it
'renders the notes'
do
create
:note_on_merge_request
,
project:
@project
,
noteable:
@merge_request
,
note:
'Rebasing with master'
visit
diffs_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
)
# Load notes and diff through AJAX
expect
(
page
).
to
have_css
(
'.note-text'
,
visible:
false
,
text:
'Rebasing with master'
)
expect
(
page
).
to
have_css
(
'.diffs.tab-pane.active'
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录