Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c9557ad7
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 搜索 >>
提交
c9557ad7
编写于
2月 27, 2018
作者:
B
Bob Van Landuyt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow maintainers to push to a single branch
上级
b2ef8385
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
40 addition
and
1 deletion
+40
-1
lib/gitlab/user_access.rb
lib/gitlab/user_access.rb
+5
-1
spec/lib/gitlab/user_access_spec.rb
spec/lib/gitlab/user_access_spec.rb
+35
-0
未找到文件。
lib/gitlab/user_access.rb
浏览文件 @
c9557ad7
...
...
@@ -68,8 +68,12 @@ module Gitlab
return
true
if
project
.
user_can_push_to_empty_repo?
(
user
)
protected_branch_accessible_to?
(
ref
,
action:
:
push
)
elsif
user
.
can?
(
:push_code
,
project
)
true
elsif
user
.
can?
(
:push_single_branch
,
project
)
project
.
branches_allowing_maintainer_access_to_user
(
user
).
include?
(
ref
)
else
user
.
can?
(
:push_code
,
project
)
false
end
end
...
...
spec/lib/gitlab/user_access_spec.rb
浏览文件 @
c9557ad7
require
'spec_helper'
describe
Gitlab
::
UserAccess
do
include
ProjectForksHelper
let
(
:access
)
{
described_class
.
new
(
user
,
project:
project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:user
)
{
create
(
:user
)
}
...
...
@@ -118,6 +120,39 @@ describe Gitlab::UserAccess do
end
end
describe
'allowing pushes to maintainers of forked projects'
do
let
(
:canonical_project
)
{
create
(
:project
,
:public
,
:repository
)
}
let
(
:project
)
{
fork_project
(
canonical_project
,
create
(
:user
),
repository:
true
)
}
before
do
create
(
:merge_request
,
target_project:
canonical_project
,
source_project:
project
,
source_branch:
'awesome-feature'
,
allow_maintainer_to_push:
true
)
end
it
'allows users that have push access to the canonical project to push to the MR branch'
do
canonical_project
.
add_developer
(
user
)
expect
(
access
.
can_push_to_branch?
(
'awesome-feature'
)).
to
be_truthy
end
it
'does not allow the user to push to other branches'
do
canonical_project
.
add_developer
(
user
)
expect
(
access
.
can_push_to_branch?
(
'master'
)).
to
be_falsey
end
it
'does not allow the user to push if he does not have push access to the canonical project'
do
canonical_project
.
add_guest
(
user
)
expect
(
access
.
can_push_to_branch?
(
'awesome-feature'
)).
to
be_falsey
end
end
describe
'merge to protected branch if allowed for developers'
do
before
do
@branch
=
create
:protected_branch
,
:developers_can_merge
,
project:
project
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录