Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6b3f0fee
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,发现更多精彩内容 >>
提交
6b3f0fee
编写于
11月 14, 2017
作者:
M
micael.bergeron
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
corrects the url building
上级
e3565631
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
45 addition
and
43 deletion
+45
-43
app/controllers/projects/merge_requests/application_controller.rb
...rollers/projects/merge_requests/application_controller.rb
+0
-6
app/controllers/projects/merge_requests/diffs_controller.rb
app/controllers/projects/merge_requests/diffs_controller.rb
+8
-0
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+2
-2
app/services/system_note_service.rb
app/services/system_note_service.rb
+3
-4
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+1
-1
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+2
-8
app/views/projects/merge_requests/diffs/_different_base.html.haml
...s/projects/merge_requests/diffs/_different_base.html.haml
+2
-2
app/views/projects/merge_requests/diffs/_diffs.html.haml
app/views/projects/merge_requests/diffs/_diffs.html.haml
+5
-5
app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml
...erge_requests/diffs/_not_all_comments_displayed.html.haml
+11
-13
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+11
-2
未找到文件。
app/controllers/projects/merge_requests/application_controller.rb
浏览文件 @
6b3f0fee
class
Projects::MergeRequests::ApplicationController
<
Projects
::
ApplicationController
before_action
:check_merge_requests_available!
before_action
:merge_request
before_action
:commit
before_action
:authorize_read_merge_request!
private
...
...
@@ -10,11 +9,6 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont
@issuable
=
@merge_request
||=
@project
.
merge_requests
.
find_by!
(
iid:
params
[
:id
])
end
def
commit
return
nil
unless
commit_id
=
params
[
:commit_id
].
presence
@commit
||=
merge_request
.
target_project
.
commit
(
commit_id
)
end
def
merge_request_params
params
.
require
(
:merge_request
).
permit
(
merge_request_params_attributes
)
end
...
...
app/controllers/projects/merge_requests/diffs_controller.rb
浏览文件 @
6b3f0fee
...
...
@@ -4,6 +4,7 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
include
RendersNotes
before_action
:apply_diff_view_cookie!
before_action
:commit
before_action
:define_diff_vars
before_action
:define_diff_comment_vars
...
...
@@ -28,6 +29,13 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
@diffs
=
@compare
.
diffs
(
diff_options
)
end
def
commit
return
nil
unless
commit_id
=
params
[
:commit_id
].
presence
return
nil
unless
@merge_request
.
all_commit_shas
.
include?
(
commit_id
)
@commit
||=
@project
.
commit
(
commit_id
)
end
def
find_merge_request_diff_compare
@merge_request_diff
=
if
diff_id
=
params
[
:diff_id
].
presence
...
...
app/helpers/commits_helper.rb
浏览文件 @
6b3f0fee
...
...
@@ -231,9 +231,9 @@ module CommitsHelper
def
commit_path
(
project
,
commit
,
merge_request:
nil
)
if
merge_request
&
.
persisted?
diffs_
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
,
commit_id:
commit
.
id
)
diffs_
project_merge_request_path
(
project
,
merge_request
,
commit_id:
commit
.
id
)
else
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
.
id
)
project_commit_path
(
project
,
commit
)
end
end
end
app/services/system_note_service.rb
浏览文件 @
6b3f0fee
...
...
@@ -670,11 +670,10 @@ module SystemNoteService
end
def
merge_request_commit_url
(
merge_request
,
commit
)
url_helpers
.
diffs_namespace_project_merge_request_url
(
merge_request
.
target_project
.
namespace
,
url_helpers
.
diffs_project_merge_request_url
(
merge_request
.
target_project
,
merge_request
.
iid
,
commit_id:
commit
.
id
merge_request
,
commit_id:
commit
)
end
end
app/views/projects/commit/_commit_box.html.haml
浏览文件 @
6b3f0fee
...
...
@@ -87,6 +87,6 @@
This commit is part of merge request
=
succeed
'.'
do
=
link_to
@merge_request
.
to_reference
,
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
)
=
link_to
@merge_request
.
to_reference
,
diffs_project_merge_request_path
(
@project
,
@merge_request
,
commit_id:
@commit
.
id
)
Comments created here will be created in the context of that merge request.
app/views/projects/commits/_commit.html.haml
浏览文件 @
6b3f0fee
...
...
@@ -4,13 +4,7 @@
-
ref
=
local_assigns
.
fetch
(
:ref
)
{
merge_request
&
.
source_branch
}
-
link
=
commit_path
(
project
,
commit
,
merge_request:
merge_request
)
-
if
@note_counts
-
note_count
=
@note_counts
.
fetch
(
commit
.
id
,
0
)
-
else
-
notes
=
commit
.
notes
-
note_count
=
notes
.
user
.
count
-
cache_key
=
[
project
.
full_path
,
commit
.
id
,
current_application_settings
,
note_count
,
@path
.
presence
,
current_controller?
(
:commits
),
merge_request
,
I18n
.
locale
]
-
cache_key
=
[
project
.
full_path
,
commit
.
id
,
current_application_settings
,
@path
.
presence
,
current_controller?
(
:commits
),
merge_request
.
iid
,
view_details
,
I18n
.
locale
]
-
cache_key
.
push
(
commit
.
status
(
ref
))
if
commit
.
status
(
ref
)
=
cache
(
cache_key
,
expires_in:
1
.
day
)
do
...
...
@@ -55,4 +49,4 @@
=
link_to_browse_code
(
project
,
commit
)
-
if
view_details
&&
merge_request
=
link_to
"View details"
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
.
id
,
merge_request_iid:
merge_request
.
iid
),
class:
"btn btn-default"
=
link_to
"View details"
,
project_commit_path
(
project
,
commit
.
id
,
merge_request_iid:
merge_request
.
iid
),
class:
"btn btn-default"
app/views/projects/merge_requests/diffs/_different_base.html.haml
浏览文件 @
6b3f0fee
...
...
@@ -4,8 +4,8 @@
=
icon
(
'info-circle'
)
Selected versions have different base commits.
Changes will include
=
link_to
namespace_project_compare_path
(
@project
.
namespace
,
@project
,
from:
@start_version
.
base_commit_sha
,
to:
@merge_request_diff
.
base_commit_sha
)
do
=
link_to
project_compare_path
(
@project
,
from:
@start_version
.
base_commit_sha
,
to:
@merge_request_diff
.
base_commit_sha
)
do
new commits
from
=
succeed
'.'
do
%code
=
@merge_request
.
target_branch
%code
.ref-name
=
@merge_request
.
target_branch
app/views/projects/merge_requests/diffs/_diffs.html.haml
浏览文件 @
6b3f0fee
...
...
@@ -6,11 +6,11 @@
-
if
@merge_request_diff
&
.
empty?
.nothing-here-block
=
image_tag
'illustrations/merge_request_changes_empty.svg'
%p
No
thing to merge from
%s
trong
=
@merge_request
.
source_branch
into
%s
trong
=
@merge_request
.
target_branch
=
succeed
'.'
do
No
changes between
%s
pan
.ref-name
=
@merge_request
.
source_branch
and
%s
pan
.ref-name
=
@merge_request
.
target_branch
%p
=
link_to
'Create commit'
,
project_new_blob_path
(
@project
,
@merge_request
.
source_branch
),
class:
'btn btn-save'
-
else
-
diff_viewable
=
@merge_request_diff
?
@merge_request_diff
.
collected?
||
@merge_request_diff
.
overflow?
:
true
...
...
app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml
浏览文件 @
6b3f0fee
-
if
@commit
||
@start_version
||
(
@merge_request_diff
&&
!
@merge_request_diff
.
latest?
)
.mr-version-controls
.content-block.comments-disabled-notif
.content-block.comments-disabled-notif
.clearfix
=
icon
(
'info-circle'
)
Not all comments are displayed because you're
=
succeed
'.'
do
-
if
@commit
viewing only the changes in commit
=
link_to
@commit
.
short_id
,
diffs_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
,
commit_id:
@commit
.
id
),
class:
"commit-sha"
-
elsif
@start_version
comparing two versions of the diff
Only comments from the following commit are shown below
-
else
viewing an old version of the diff
.text-right
=
link_to
diffs_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
'btn btn-sm'
do
Show latest version
=
"of the diff"
if
@commit
Not all comments are displayed because you're
-
if
@start_version
comparing two versions of the diff
-
else
viewing an old version of the diff
.pull-right
=
link_to
diffs_project_merge_request_path
(
@project
,
@merge_request
),
class:
'btn btn-sm'
do
Show latest version
=
"of the diff"
if
@commit
spec/services/system_note_service_spec.rb
浏览文件 @
6b3f0fee
...
...
@@ -690,11 +690,20 @@ describe SystemNoteService do
end
describe
'.new_commit_summary'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
:simple
,
target_project:
project
,
source_project:
project
)
}
it
'escapes HTML titles'
do
commit
=
double
(
title:
'<pre>This is a test</pre>'
,
short_id:
'12345678'
)
escaped
=
'* 12345678 - <pre>This is a test</pre>'
escaped
=
'<pre>This is a test</pre>'
expect
(
described_class
.
new_commit_summary
(
merge_request
,
[
commit
])).
to
all
(
match
(
%r[-
#{
escaped
}
]
))
end
it
'contains the MR diffs commit url'
do
commit
=
merge_request
.
commits
.
last
url
=
%r[/merge_requests/
#{
merge_request
.
iid
}
/diffs
\?
commit_id=
#{
commit
.
id
}
]
expect
(
described_class
.
new_commit_summary
(
[
commit
])).
to
eq
([
escaped
]
)
expect
(
described_class
.
new_commit_summary
(
merge_request
,
[
commit
])).
to
all
(
match
(
url
)
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录