Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6bd8e4cb
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,发现更多精彩内容 >>
提交
6bd8e4cb
编写于
1月 25, 2019
作者:
F
Francisco Javier López
提交者:
Yorick Peterse
1月 25, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[master] Check access rights when creating/updating ProtectedRefs
上级
e8ec4b96
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
23 deletion
+8
-23
app/services/protected_branches/api_service.rb
app/services/protected_branches/api_service.rb
+0
-8
spec/lib/gitlab/git_access_spec.rb
spec/lib/gitlab/git_access_spec.rb
+8
-15
未找到文件。
app/services/protected_branches/api_service.rb
浏览文件 @
6bd8e4cb
...
...
@@ -6,8 +6,6 @@ module ProtectedBranches
@push_params
=
AccessLevelParams
.
new
(
:push
,
params
)
@merge_params
=
AccessLevelParams
.
new
(
:merge
,
params
)
verify_params!
protected_branch_params
=
{
name:
params
[
:name
],
push_access_levels_attributes:
@push_params
.
access_levels
,
...
...
@@ -16,11 +14,5 @@ module ProtectedBranches
::
ProtectedBranches
::
CreateService
.
new
(
@project
,
@current_user
,
protected_branch_params
).
execute
end
private
def
verify_params!
# EE-only
end
end
end
spec/lib/gitlab/git_access_spec.rb
浏览文件 @
6bd8e4cb
...
...
@@ -776,10 +776,13 @@ describe Gitlab::GitAccess do
it
"has the correct permissions for
#{
role
}
s"
do
if
role
==
:admin
user
.
update_attribute
(
:admin
,
true
)
project
.
add_guest
(
user
)
else
project
.
add_role
(
user
,
role
)
end
protected_branch
.
save
aggregate_failures
do
matrix
.
each
do
|
action
,
allowed
|
check
=
->
{
push_changes
(
changes
[
action
])
}
...
...
@@ -861,25 +864,19 @@ describe Gitlab::GitAccess do
[
%w(feature exact)
,
[
'feat*'
,
'wildcard'
]].
each
do
|
protected_branch_name
,
protected_branch_type
|
context
do
before
do
create
(
:protected_branch
,
name:
protected_branch_name
,
project:
project
)
end
let
(
:protected_branch
)
{
create
(
:protected_branch
,
:maintainers_can_push
,
name:
protected_branch_name
,
project:
project
)
}
run_permission_checks
(
permissions_matrix
)
end
context
"when developers are allowed to push into the
#{
protected_branch_type
}
protected branch"
do
before
do
create
(
:protected_branch
,
:developers_can_push
,
name:
protected_branch_name
,
project:
project
)
end
let
(
:protected_branch
)
{
create
(
:protected_branch
,
:developers_can_push
,
name:
protected_branch_name
,
project:
project
)
}
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
push_protected_branch:
true
,
push_all:
true
,
merge_into_protected_branch:
true
}))
end
context
"developers are allowed to merge into the
#{
protected_branch_type
}
protected branch"
do
before
do
create
(
:protected_branch
,
:developers_can_merge
,
name:
protected_branch_name
,
project:
project
)
end
let
(
:protected_branch
)
{
create
(
:protected_branch
,
:developers_can_merge
,
name:
protected_branch_name
,
project:
project
)
}
context
"when a merge request exists for the given source/target branch"
do
context
"when the merge request is in progress"
do
...
...
@@ -906,17 +903,13 @@ describe Gitlab::GitAccess do
end
context
"when developers are allowed to push and merge into the
#{
protected_branch_type
}
protected branch"
do
before
do
create
(
:protected_branch
,
:developers_can_merge
,
:developers_can_push
,
name:
protected_branch_name
,
project:
project
)
end
let
(
:protected_branch
)
{
create
(
:protected_branch
,
:developers_can_merge
,
:developers_can_push
,
name:
protected_branch_name
,
project:
project
)
}
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
push_protected_branch:
true
,
push_all:
true
,
merge_into_protected_branch:
true
}))
end
context
"when no one is allowed to push to the
#{
protected_branch_name
}
protected branch"
do
before
do
create
(
:protected_branch
,
:no_one_can_push
,
name:
protected_branch_name
,
project:
project
)
end
let
(
:protected_branch
)
{
build
(
:protected_branch
,
:no_one_can_push
,
name:
protected_branch_name
,
project:
project
)
}
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
push_protected_branch:
false
,
push_all:
false
,
merge_into_protected_branch:
false
},
maintainer:
{
push_protected_branch:
false
,
push_all:
false
,
merge_into_protected_branch:
false
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录