Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4f71c29c
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,发现更多精彩内容 >>
提交
4f71c29c
编写于
4月 03, 2017
作者:
J
James Edwards-Jones
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Moved default_branch_protected? out of Project
上级
bf3cc824
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
13 deletion
+7
-13
app/models/project.rb
app/models/project.rb
+1
-12
app/models/protected_branch.rb
app/models/protected_branch.rb
+6
-1
未找到文件。
app/models/project.rb
浏览文件 @
4f71c29c
...
...
@@ -883,11 +883,6 @@ class Project < ActiveRecord::Base
"
#{
url
}
.git"
end
def
empty_and_default_branch_protected?
empty_repo?
&&
default_branch_protected?
end
#TODO: Check with if this is still needed, maybe because of `.select {` in ProtectedRefsMatcher
#Either with tests or by asking Tim
def
protected_tags_array
...
...
@@ -899,7 +894,7 @@ class Project < ActiveRecord::Base
end
def
user_can_push_to_empty_repo?
(
user
)
!
default_branch_protected?
||
team
.
max_member_access
(
user
.
id
)
>
Gitlab
::
Access
::
DEVELOPER
!
ProtectedBranch
.
default_branch_protected?
||
team
.
max_member_access
(
user
.
id
)
>
Gitlab
::
Access
::
DEVELOPER
end
def
forked?
...
...
@@ -1366,12 +1361,6 @@ class Project < ActiveRecord::Base
"projects/
#{
id
}
/pushes_since_gc"
end
#TODO: Move this and methods which depend upon it
def
default_branch_protected?
current_application_settings
.
default_branch_protection
==
Gitlab
::
Access
::
PROTECTION_FULL
||
current_application_settings
.
default_branch_protection
==
Gitlab
::
Access
::
PROTECTION_DEV_CAN_MERGE
end
# Similar to the normal callbacks that hook into the life cycle of an
# Active Record object, you can also define callbacks that get triggered
# when you add an object to an association collection. If any of these
...
...
app/models/protected_branch.rb
浏览文件 @
4f71c29c
...
...
@@ -13,9 +13,14 @@ class ProtectedBranch < ActiveRecord::Base
# Check if branch name is marked as protected in the system
def
self
.
protected?
(
project
,
ref_name
)
return
true
if
project
.
empty_
and_
default_branch_protected?
return
true
if
project
.
empty_
repo?
&&
default_branch_protected?
protected_refs
=
project
.
protected_branches_array
self
.
matching
(
ref_name
,
protected_refs:
protected_refs
).
present?
end
def
self
.
default_branch_protected?
current_application_settings
.
default_branch_protection
==
Gitlab
::
Access
::
PROTECTION_FULL
||
current_application_settings
.
default_branch_protection
==
Gitlab
::
Access
::
PROTECTION_DEV_CAN_MERGE
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录