BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
025a1b01
Commit
025a1b01
authored
May 10, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enabled no-one as a merge access level in protected branches
Closes #31541
parent
566ee145
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
29 deletions
+23
-29
protected_branch_access.rb
app/models/concerns/protected_branch_access.rb
+18
-0
merge_access_level.rb
app/models/protected_branch/merge_access_level.rb
+0
-10
push_access_level.rb
app/models/protected_branch/push_access_level.rb
+0
-18
protected-branches-no-one-merge.yml
changelogs/unreleased/protected-branches-no-one-merge.yml
+4
-0
access_control_ce_spec.rb
spec/features/protected_branches/access_control_ce_spec.rb
+1
-1
No files found.
app/models/concerns/protected_branch_access.rb
View file @
025a1b01
...
...
@@ -7,5 +7,23 @@ module ProtectedBranchAccess
belongs_to
:protected_branch
delegate
:project
,
to: :protected_branch
validates
:access_level
,
presence:
true
,
inclusion:
{
in:
[
Gitlab
::
Access
::
MASTER
,
Gitlab
::
Access
::
DEVELOPER
,
Gitlab
::
Access
::
NO_ACCESS
]
}
def
self
.
human_access_levels
{
Gitlab
::
Access
::
MASTER
=>
"Masters"
,
Gitlab
::
Access
::
DEVELOPER
=>
"Developers + Masters"
,
Gitlab
::
Access
::
NO_ACCESS
=>
"No one"
}.
with_indifferent_access
end
def
check_access
(
user
)
return
false
if
access_level
==
Gitlab
::
Access
::
NO_ACCESS
super
end
end
end
app/models/protected_branch/merge_access_level.rb
View file @
025a1b01
class
ProtectedBranch
::
MergeAccessLevel
<
ActiveRecord
::
Base
include
ProtectedBranchAccess
validates
:access_level
,
presence:
true
,
inclusion:
{
in:
[
Gitlab
::
Access
::
MASTER
,
Gitlab
::
Access
::
DEVELOPER
]
}
def
self
.
human_access_levels
{
Gitlab
::
Access
::
MASTER
=>
"Masters"
,
Gitlab
::
Access
::
DEVELOPER
=>
"Developers + Masters"
}.
with_indifferent_access
end
end
app/models/protected_branch/push_access_level.rb
View file @
025a1b01
class
ProtectedBranch
::
PushAccessLevel
<
ActiveRecord
::
Base
include
ProtectedBranchAccess
validates
:access_level
,
presence:
true
,
inclusion:
{
in:
[
Gitlab
::
Access
::
MASTER
,
Gitlab
::
Access
::
DEVELOPER
,
Gitlab
::
Access
::
NO_ACCESS
]
}
def
self
.
human_access_levels
{
Gitlab
::
Access
::
MASTER
=>
"Masters"
,
Gitlab
::
Access
::
DEVELOPER
=>
"Developers + Masters"
,
Gitlab
::
Access
::
NO_ACCESS
=>
"No one"
}.
with_indifferent_access
end
def
check_access
(
user
)
return
false
if
access_level
==
Gitlab
::
Access
::
NO_ACCESS
super
end
end
changelogs/unreleased/protected-branches-no-one-merge.yml
0 → 100644
View file @
025a1b01
---
title
:
Allow 'no one' as an option for allowed to merge on a procted branch
merge_request
:
author
:
spec/features/protected_branches/access_control_ce_spec.rb
View file @
025a1b01
...
...
@@ -31,7 +31,7 @@ RSpec.shared_examples "protected branches > access control > CE" do
within
(
".protected-branches-list"
)
do
find
(
".js-allowed-to-push"
).
click
within
(
'.js-allowed-to-push-container'
)
do
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
click_on
access_type_name
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment