Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
57fc7cd8
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 搜索 >>
提交
57fc7cd8
编写于
7月 10, 2018
作者:
S
Sean McGivern
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make sure ConflictsService does not raise for conflicting submodules
上级
3d4873fa
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
31 addition
and
15 deletion
+31
-15
lib/gitlab/gitaly_client/conflicts_service.rb
lib/gitlab/gitaly_client/conflicts_service.rb
+6
-4
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+14
-8
spec/services/merge_requests/conflicts/list_service_spec.rb
spec/services/merge_requests/conflicts/list_service_spec.rb
+8
-2
spec/support/helpers/test_env.rb
spec/support/helpers/test_env.rb
+3
-1
未找到文件。
lib/gitlab/gitaly_client/conflicts_service.rb
浏览文件 @
57fc7cd8
...
...
@@ -25,10 +25,12 @@ module Gitlab
def
conflicts?
list_conflict_files
.
any?
rescue
GRPC
::
FailedPrecondition
# The server raises this exception when it encounters ConflictSideMissing, which
# means a conflict exists but its `theirs` or `ours` data is nil due to a non-existent
# file in one of the trees.
rescue
GRPC
::
FailedPrecondition
,
GRPC
::
Unknown
# The server raises FailedPrecondition when it encounters
# ConflictSideMissing, which means a conflict exists but its `theirs` or
# `ours` data is nil due to a non-existent file in one of the trees.
#
# GRPC::Unknown comes from Rugged::ReferenceError and Rugged::OdbError.
true
end
...
...
spec/models/repository_spec.rb
浏览文件 @
57fc7cd8
...
...
@@ -431,6 +431,18 @@ describe Repository do
it
{
is_expected
.
to
be_falsey
}
end
context
'non merged branch'
do
subject
{
repository
.
merged_to_root_ref?
(
'fix'
)
}
it
{
is_expected
.
to
be_falsey
}
end
context
'non existent branch'
do
subject
{
repository
.
merged_to_root_ref?
(
'non_existent_branch'
)
}
it
{
is_expected
.
to
be_nil
}
end
end
describe
'#can_be_merged?'
do
...
...
@@ -452,17 +464,11 @@ describe Repository do
it
{
is_expected
.
to
be_falsey
}
end
context
'
non merged branch
'
do
subject
{
repository
.
merged_to_root_ref?
(
'fix
'
)
}
context
'
submodule changes that confuse rugged
'
do
subject
{
repository
.
can_be_merged?
(
'update-gitlab-shell-v-6-0-1'
,
'update-gitlab-shell-v-6-0-3
'
)
}
it
{
is_expected
.
to
be_falsey
}
end
context
'non existent branch'
do
subject
{
repository
.
merged_to_root_ref?
(
'non_existent_branch'
)
}
it
{
is_expected
.
to
be_nil
}
end
end
describe
'#commit'
do
...
...
spec/services/merge_requests/conflicts/list_service_spec.rb
浏览文件 @
57fc7cd8
...
...
@@ -2,8 +2,8 @@ require 'spec_helper'
describe
MergeRequests
::
Conflicts
::
ListService
do
describe
'#can_be_resolved_in_ui?'
do
def
create_merge_request
(
source_branch
)
create
(
:merge_request
,
source_branch:
source_branch
,
target_branch:
'conflict-start'
,
merge_status: :unchecked
)
do
|
mr
|
def
create_merge_request
(
source_branch
,
target_branch
=
'conflict-start'
)
create
(
:merge_request
,
source_branch:
source_branch
,
target_branch:
target_branch
,
merge_status: :unchecked
)
do
|
mr
|
mr
.
mark_as_unmergeable
end
end
...
...
@@ -84,5 +84,11 @@ describe MergeRequests::Conflicts::ListService do
expect
(
service
.
can_be_resolved_in_ui?
).
to
be_falsey
end
it
'returns a falsey value when the conflict is in a submodule revision'
do
merge_request
=
create_merge_request
(
'update-gitlab-shell-v-6-0-3'
,
'update-gitlab-shell-v-6-0-1'
)
expect
(
conflicts_service
(
merge_request
).
can_be_resolved_in_ui?
).
to
be_falsey
end
end
end
spec/support/helpers/test_env.rb
浏览文件 @
57fc7cd8
...
...
@@ -49,7 +49,9 @@ module TestEnv
'add-pdf-file'
=>
'e774ebd'
,
'squash-large-files'
=>
'54cec52'
,
'add-pdf-text-binary'
=>
'79faa7b'
,
'add_images_and_changes'
=>
'010d106'
'add_images_and_changes'
=>
'010d106'
,
'update-gitlab-shell-v-6-0-1'
=>
'2f61d70'
,
'update-gitlab-shell-v-6-0-3'
=>
'de78448'
}.
freeze
# gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录