Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c77083a4
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,发现更多精彩内容 >>
提交
c77083a4
编写于
12月 18, 2017
作者:
M
Micaël Bergeron
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix the commit diff discussion sending the wrong url
it should now send you to the merge request diff path scoped to the commit.
上级
c9041508
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
7 deletion
+26
-7
app/models/diff_discussion.rb
app/models/diff_discussion.rb
+14
-5
spec/helpers/notes_helper_spec.rb
spec/helpers/notes_helper_spec.rb
+12
-2
未找到文件。
app/models/diff_discussion.rb
浏览文件 @
c77083a4
...
...
@@ -22,12 +22,10 @@ class DiffDiscussion < Discussion
def
merge_request_version_params
return
unless
for_merge_request?
return
{}
if
active?
if
on_merge_request_commit?
{
commit_id:
commit_id
}
else
noteable
.
version_params_for
(
position
.
diff_refs
)
version_params
do
|
params
|
params
[
:commit_id
]
=
commit_id
if
on_merge_request_commit?
params
end
end
...
...
@@ -37,4 +35,15 @@ class DiffDiscussion < Discussion
position:
position
.
to_json
)
end
private
def
version_params
params
=
if
active?
{}
else
noteable
.
version_params_for
(
position
.
diff_refs
)
end
yield
params
end
end
spec/helpers/notes_helper_spec.rb
浏览文件 @
c77083a4
...
...
@@ -41,6 +41,7 @@ describe NotesHelper do
describe
'#discussion_path'
do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:anchor
)
{
discussion
.
line_code
}
context
'for a merge request discusion'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
target_project:
project
,
importing:
true
)
}
...
...
@@ -151,6 +152,15 @@ describe NotesHelper do
expect
(
helper
.
discussion_path
(
discussion
)).
to
be_nil
end
end
context
'for a contextual commit discussion'
do
let
(
:commit
)
{
merge_request
.
commits
.
last
}
let
(
:discussion
)
{
create
(
:diff_note_on_merge_request
,
noteable:
merge_request
,
project:
project
,
commit_id:
commit
.
id
).
to_discussion
}
it
'returns the merge request diff discussion scoped in the commit'
do
expect
(
helper
.
discussion_path
(
discussion
)).
to
eq
(
diffs_project_merge_request_path
(
project
,
merge_request
,
commit_id:
commit
.
id
,
anchor:
anchor
))
end
end
end
context
'for a commit discussion'
do
...
...
@@ -160,7 +170,7 @@ describe NotesHelper do
let
(
:discussion
)
{
create
(
:diff_note_on_commit
,
project:
project
).
to_discussion
}
it
'returns the commit path with the line code'
do
expect
(
helper
.
discussion_path
(
discussion
)).
to
eq
(
project_commit_path
(
project
,
commit
,
anchor:
discussion
.
line_code
))
expect
(
helper
.
discussion_path
(
discussion
)).
to
eq
(
project_commit_path
(
project
,
commit
,
anchor:
anchor
))
end
end
...
...
@@ -168,7 +178,7 @@ describe NotesHelper do
let
(
:discussion
)
{
create
(
:legacy_diff_note_on_commit
,
project:
project
).
to_discussion
}
it
'returns the commit path with the line code'
do
expect
(
helper
.
discussion_path
(
discussion
)).
to
eq
(
project_commit_path
(
project
,
commit
,
anchor:
discussion
.
line_code
))
expect
(
helper
.
discussion_path
(
discussion
)).
to
eq
(
project_commit_path
(
project
,
commit
,
anchor:
anchor
))
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录