Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
eb355dec
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,发现更多精彩内容 >>
未验证
提交
eb355dec
编写于
8月 22, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Restore diff_sha_refs method
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
9329436d
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
24 addition
and
19 deletion
+24
-19
app/models/diff_note.rb
app/models/diff_note.rb
+5
-1
app/models/merge_request.rb
app/models/merge_request.rb
+16
-15
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+3
-3
未找到文件。
app/models/diff_note.rb
浏览文件 @
eb355dec
...
...
@@ -118,8 +118,12 @@ class DiffNote < Note
end
def
noteable_diff_refs
if
noteable
.
respond_to?
(:
diff_sha_refs
)
noteable
.
diff_sha_refs
else
noteable
.
diff_refs
end
end
def
set_original_position
self
.
original_position
=
self
.
position
.
dup
...
...
app/models/merge_request.rb
浏览文件 @
eb355dec
...
...
@@ -265,26 +265,27 @@ class MergeRequest < ActiveRecord::Base
@source_branch_sha
||
source_branch_head
.
try
(
:sha
)
end
def
branch_merge_base_sha
branch_merge_base_commit
.
try
(
:sha
)
def
diff_refs
return
unless
diff_start_commit
||
diff_base_commit
Gitlab
::
Diff
::
DiffRefs
.
new
(
base_sha:
diff_base_sha
,
start_sha:
diff_start_sha
,
head_sha:
diff_head_sha
)
end
def
diff_refs
# Return diff_refs instance trying to not touch the git repository
def
diff_sha_refs
if
merge_request_diff
&&
merge_request_diff
.
diff_refs_by_sha?
merge_request_diff
.
diff_refs
else
start_sha
=
target_branch_sha
head_sha
=
source_branch_sha
base_sha
=
branch_merge_base_sha
if
start_sha
||
base_sha
Gitlab
::
Diff
::
DiffRefs
.
new
(
base_sha:
base_sha
,
start_sha:
start_sha
,
head_sha:
head_sha
)
diff_refs
end
end
def
branch_merge_base_sha
branch_merge_base_commit
.
try
(
:sha
)
end
def
validate_branches
...
...
@@ -748,7 +749,7 @@ class MergeRequest < ActiveRecord::Base
end
def
has_complete_diff_refs?
diff_
refs
&&
diff
_refs
.
complete?
diff_
sha_refs
&&
diff_sha
_refs
.
complete?
end
def
update_diff_notes_positions
(
old_diff_refs
:,
new_diff_refs
:)
...
...
spec/models/merge_request_spec.rb
浏览文件 @
eb355dec
...
...
@@ -782,7 +782,7 @@ describe MergeRequest, models: true do
end
end
describe
"#diff_refs"
do
describe
"#diff_
sha_
refs"
do
context
"with diffs"
do
subject
{
create
(
:merge_request
,
:with_diffs
)
}
...
...
@@ -791,7 +791,7 @@ describe MergeRequest, models: true do
expect_any_instance_of
(
Repository
).
not_to
receive
(
:commit
)
subject
.
diff_refs
subject
.
diff_
sha_
refs
end
it
"returns expected diff_refs"
do
...
...
@@ -801,7 +801,7 @@ describe MergeRequest, models: true do
head_sha:
subject
.
merge_request_diff
.
head_commit_sha
)
expect
(
subject
.
diff_refs
).
to
eq
(
expected_diff_refs
)
expect
(
subject
.
diff_
sha_
refs
).
to
eq
(
expected_diff_refs
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录