Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
643a368f
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 搜索 >>
未验证
提交
643a368f
编写于
8月 15, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make merge request diff works with new FileCollection logic
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
5e95c0b8
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
22 addition
and
17 deletion
+22
-17
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+1
-1
app/models/merge_request.rb
app/models/merge_request.rb
+3
-3
app/models/merge_request_diff.rb
app/models/merge_request_diff.rb
+9
-5
app/views/projects/merge_requests/show/_diffs.html.haml
app/views/projects/merge_requests/show/_diffs.html.haml
+1
-0
lib/gitlab/diff/file_collection/merge_request_diff.rb
lib/gitlab/diff/file_collection/merge_request_diff.rb
+8
-8
未找到文件。
app/controllers/projects/merge_requests_controller.rb
浏览文件 @
643a368f
...
...
@@ -91,7 +91,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
respond_to
do
|
format
|
format
.
html
{
define_discussion_vars
}
format
.
json
do
@diffs
=
@merge_request
.
diffs
(
diff_options
)
@diffs
=
@merge_request
_diff
.
diffs
(
diff_options
)
render
json:
{
html:
view_to_html_string
(
"projects/merge_requests/show/_diffs"
)
}
end
...
...
app/models/merge_request.rb
浏览文件 @
643a368f
...
...
@@ -172,10 +172,10 @@ class MergeRequest < ActiveRecord::Base
end
def
diffs
(
diff_options
=
nil
)
if
self
.
compare
self
.
compare
.
diffs
(
diff_options
)
if
compare
compare
.
diffs
(
diff_options
)
else
Gitlab
::
Diff
::
FileCollection
::
MergeRequest
.
new
(
self
,
diff_options:
diff_options
)
merge_request_diff
.
diffs
(
diff_options
)
end
end
...
...
app/models/merge_request_diff.rb
浏览文件 @
643a368f
...
...
@@ -141,7 +141,13 @@ class MergeRequestDiff < ActiveRecord::Base
base_commit_sha?
&&
head_commit_sha?
&&
start_commit_sha?
end
private
def
diffs
(
diff_options
=
nil
)
Gitlab
::
Diff
::
FileCollection
::
MergeRequestDiff
.
new
(
self
,
diff_options:
diff_options
)
end
def
project
merge_request
.
target_project
end
def
compare
@compare
||=
...
...
@@ -157,6 +163,8 @@ class MergeRequestDiff < ActiveRecord::Base
end
end
private
def
dump_commits
(
commits
)
commits
.
map
(
&
:to_hash
)
end
...
...
@@ -229,10 +237,6 @@ class MergeRequestDiff < ActiveRecord::Base
update_columns_serialized
(
new_attributes
)
end
def
project
merge_request
.
target_project
end
def
repository
project
.
repository
end
...
...
app/views/projects/merge_requests/show/_diffs.html.haml
浏览文件 @
643a368f
-
if
@merge_request_diff
.
collected?
=
render
'projects/merge_requests/show/versions'
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
-
elsif
@merge_request_diff
.
empty?
.nothing-here-block
Nothing to merge from
#{
@merge_request
.
source_branch
}
into
#{
@merge_request
.
target_branch
}
...
...
lib/gitlab/diff/file_collection/merge_request.rb
→
lib/gitlab/diff/file_collection/merge_request
_diff
.rb
浏览文件 @
643a368f
module
Gitlab
module
Diff
module
FileCollection
class
MergeRequest
<
Base
def
initialize
(
merge_request
,
diff_options
:)
@merge_request
=
merge_request
class
MergeRequest
Diff
<
Base
def
initialize
(
merge_request
_diff
,
diff_options
:)
@merge_request
_diff
=
merge_request_diff
super
(
merge_request
,
project:
merge_request
.
project
,
super
(
merge_request
_diff
,
project:
merge_request
_diff
.
project
,
diff_options:
diff_options
,
diff_refs:
merge_request
.
diff_refs
)
diff_refs:
merge_request
_diff
.
diff_refs
)
end
def
diff_files
...
...
@@ -61,11 +61,11 @@ module Gitlab
end
def
cacheable?
@merge_request
.
merge_request
_diff
.
present?
@merge_request_diff
.
present?
end
def
cache_key
[
@merge_request
.
merge_request
_diff
,
'highlighted-diff-files'
,
diff_options
]
[
@merge_request_diff
,
'highlighted-diff-files'
,
diff_options
]
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录