Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8b35b208
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,发现更多精彩内容 >>
提交
8b35b208
编写于
1月 28, 2014
作者:
S
Steven Thonus
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
first setup to protect protected branched to force updates
上级
7f67e066
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
9 deletion
+16
-9
lib/api/internal.rb
lib/api/internal.rb
+3
-1
lib/gitlab/git_access.rb
lib/gitlab/git_access.rb
+13
-8
未找到文件。
lib/api/internal.rb
浏览文件 @
8b35b208
...
...
@@ -10,6 +10,7 @@ module API
# project - project path with namespace
# action - git action (git-upload-pack or git-receive-pack)
# ref - branch name
# forced_push - forced_push
#
get
"/allowed"
do
# Check for *.wiki repositories.
...
...
@@ -35,7 +36,8 @@ module API
project
,
params
[
:ref
],
params
[
:oldrev
],
params
[
:newrev
]
params
[
:newrev
],
params
[
:forced_push
]
)
end
...
...
lib/gitlab/git_access.rb
浏览文件 @
8b35b208
...
...
@@ -5,7 +5,7 @@ module Gitlab
attr_reader
:params
,
:project
,
:git_cmd
,
:user
def
allowed?
(
actor
,
cmd
,
project
,
ref
=
nil
,
oldrev
=
nil
,
newrev
=
nil
)
def
allowed?
(
actor
,
cmd
,
project
,
ref
=
nil
,
oldrev
=
nil
,
newrev
=
nil
,
forced_push
=
false
)
case
cmd
when
*
DOWNLOAD_COMMANDS
if
actor
.
is_a?
User
...
...
@@ -19,12 +19,12 @@ module Gitlab
end
when
*
PUSH_COMMANDS
if
actor
.
is_a?
User
push_allowed?
(
actor
,
project
,
ref
,
oldrev
,
newrev
)
push_allowed?
(
actor
,
project
,
ref
,
oldrev
,
newrev
,
forced_push
)
elsif
actor
.
is_a?
DeployKey
# Deploy key not allowed to push
return
false
elsif
actor
.
is_a?
Key
push_allowed?
(
actor
.
user
,
project
,
ref
,
oldrev
,
newrev
)
push_allowed?
(
actor
.
user
,
project
,
ref
,
oldrev
,
newrev
,
forced_push
)
else
raise
'Wrong actor'
end
...
...
@@ -41,13 +41,18 @@ module Gitlab
end
end
def
push_allowed?
(
user
,
project
,
ref
,
oldrev
,
newrev
)
def
push_allowed?
(
user
,
project
,
ref
,
oldrev
,
newrev
,
forced_push
)
if
user
&&
user_allowed?
(
user
)
action
=
if
project
.
protected_branch?
(
ref
)
:push_code_to_protected_branches
else
:push_code
end
if
forced_push
:force_push_code_to_protected_branches
else
:push_code_to_protected_branches
end
else
:push_code
end
user
.
can?
(
action
,
project
)
else
false
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录