Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6f7a3ee6
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 搜索 >>
提交
6f7a3ee6
编写于
9月 07, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor merge request version compare feature
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
5f0535ac
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
9 deletion
+11
-9
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+2
-6
app/models/merge_request_diff.rb
app/models/merge_request_diff.rb
+4
-0
app/views/projects/merge_requests/show/_versions.html.haml
app/views/projects/merge_requests/show/_versions.html.haml
+5
-3
未找到文件。
app/controllers/projects/merge_requests_controller.rb
浏览文件 @
6f7a3ee6
...
...
@@ -542,7 +542,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def
compared_diff_version
compare
=
CompareService
.
new
.
execute
(
@project
,
@merge_request_diff
.
head_commit_sha
,
@project
,
@start_sha
)
compare
=
@merge_request_diff
.
compare_with
(
@start_sha
)
if
compare
@diffs
=
compare
.
diffs
(
diff_options
)
...
...
@@ -551,11 +551,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def
original_diff_version
unless
@merge_request_diff
.
latest?
# Disable comments if browsing older version of the diff
@diff_notes_disabled
=
true
end
@diff_notes_disabled
=
!
@merge_request_diff
.
latest?
@diffs
=
@merge_request_diff
.
diffs
(
diff_options
)
end
end
app/models/merge_request_diff.rb
浏览文件 @
6f7a3ee6
...
...
@@ -152,6 +152,10 @@ class MergeRequestDiff < ActiveRecord::Base
self
==
merge_request
.
merge_request_diff
end
def
compare_with
(
sha
)
CompareService
.
new
.
execute
(
project
,
head_commit_sha
,
project
,
sha
)
end
private
def
dump_commits
(
commits
)
...
...
app/views/projects/merge_requests/show/_versions.html.haml
浏览文件 @
6f7a3ee6
...
...
@@ -24,7 +24,7 @@
=
time_ago_with_tooltip
(
merge_request_diff
.
created_at
)
-
if
@merge_request_diff
.
base_commit_sha
and
and
%span
.dropdown.inline.mr-version-compare-dropdown
%a
.btn-link.dropdown-toggle
{
data:
{
toggle: :dropdown
}
}
%strong
...
...
@@ -51,8 +51,10 @@
#{
@merge_request
.
target_branch
}
(base)
.monospace
#{
short_sha
(
@merge_request_diff
.
base_commit_sha
)
}
-
unless
@merge_request_diff
.
latest?
&&
!
@start_sha
.prepend-top-10
=
icon
(
'info-circle'
)
Comments are disabled while viewing outdated merge versions or comparing to versions other than base.
-
if
@start_sha
Comments are disabled because you're comparing two versions of this merge request.
-
else
Comments are disabled because you're viewing an old version of this merge request.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录