Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a72d4491
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,发现更多精彩内容 >>
提交
a72d4491
编写于
7月 25, 2016
作者:
T
Timothy Andrew
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove duplicate specs from `git_access_spec`
- Likely introduced during an improper conflict resolution.
上级
7b2ad2d5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
9 deletion
+7
-9
spec/lib/gitlab/git_access_spec.rb
spec/lib/gitlab/git_access_spec.rb
+7
-9
未找到文件。
spec/lib/gitlab/git_access_spec.rb
浏览文件 @
a72d4491
...
@@ -250,23 +250,21 @@ describe Gitlab::GitAccess, lib: true do
...
@@ -250,23 +250,21 @@ describe Gitlab::GitAccess, lib: true do
state:
'locked'
,
in_progress_merge_commit_sha:
merge_into_protected_branch
)
state:
'locked'
,
in_progress_merge_commit_sha:
merge_into_protected_branch
)
end
end
context
"when the merge request is not in progress"
do
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
merge_into_protected_branch:
true
}))
before
do
end
create
(
:merge_request
,
source_project:
project
,
source_branch:
unprotected_branch
,
target_branch:
'feature'
,
in_progress_merge_commit_sha:
nil
)
end
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
merge_into_protected_branch:
false
}))
context
"when the merge request is not in progress"
do
before
do
create
(
:merge_request
,
source_project:
project
,
source_branch:
unprotected_branch
,
target_branch:
'feature'
,
in_progress_merge_commit_sha:
nil
)
end
end
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
merge_into_protected_branch:
false
}))
end
end
context
"when a merge request does not exist for the given source/target branch"
do
context
"when a merge request does not exist for the given source/target branch"
do
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
merge_into_protected_branch:
false
}))
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
merge_into_protected_branch:
false
}))
end
end
end
end
context
"when a merge request does not exist for the given source/target branch"
do
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
merge_into_protected_branch:
false
}))
end
end
end
context
"when developers are allowed to push and merge into the
#{
protected_branch_type
}
protected branch"
do
context
"when developers are allowed to push and merge into the
#{
protected_branch_type
}
protected branch"
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录