Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cfcc7043
Commit
cfcc7043
authored
May 22, 2018
by
Mark Chao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename “Developers + Masters”
parent
a8b570d8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
11 deletions
+11
-11
app/models/concerns/protected_ref_access.rb
app/models/concerns/protected_ref_access.rb
+2
-2
doc/api/protected_branches.md
doc/api/protected_branches.md
+2
-2
doc/user/project/protected_branches.md
doc/user/project/protected_branches.md
+2
-2
qa/qa/page/project/settings/protected_branches.rb
qa/qa/page/project/settings/protected_branches.rb
+2
-2
qa/qa/specs/features/repository/protected_branches_spec.rb
qa/qa/specs/features/repository/protected_branches_spec.rb
+1
-1
spec/features/protected_branches_spec.rb
spec/features/protected_branches_spec.rb
+2
-2
No files found.
app/models/concerns/protected_ref_access.rb
View file @
cfcc7043
...
...
@@ -8,8 +8,8 @@ module ProtectedRefAccess
].
freeze
HUMAN_ACCESS_LEVELS
=
{
Gitlab
::
Access
::
MASTER
=>
"Ma
st
ers"
.
freeze
,
Gitlab
::
Access
::
DEVELOPER
=>
"Developers + Ma
st
ers"
.
freeze
,
Gitlab
::
Access
::
MASTER
=>
"Ma
intain
ers"
.
freeze
,
Gitlab
::
Access
::
DEVELOPER
=>
"Developers + Ma
intain
ers"
.
freeze
,
Gitlab
::
Access
::
NO_ACCESS
=>
"No one"
.
freeze
}.
freeze
...
...
doc/api/protected_branches.md
View file @
cfcc7043
...
...
@@ -115,13 +115,13 @@ Example response:
"push_access_levels"
:
[
{
"access_level"
:
30
,
"access_level_description"
:
"Developers + Ma
st
ers"
"access_level_description"
:
"Developers + Ma
intain
ers"
}
],
"merge_access_levels"
:
[
{
"access_level"
:
30
,
"access_level_description"
:
"Developers + Ma
st
ers"
"access_level_description"
:
"Developers + Ma
intain
ers"
}
]
}
...
...
doc/user/project/protected_branches.md
View file @
cfcc7043
...
...
@@ -50,14 +50,14 @@ allow/prohibit Masters and/or Developers to push to a protected branch.
Using the "Allowed to push" and "Allowed to merge" settings, you can control
the actions that different roles can perform with the protected branch.
For example, you could set "Allowed to push" to "No one", and "Allowed to merge"
to "Developers + Ma
st
ers", to require _everyone_ to submit a merge request for
to "Developers + Ma
intain
ers", to require _everyone_ to submit a merge request for
changes going into the protected branch. This is compatible with workflows like
the
[
GitLab workflow
](
../../workflow/gitlab_flow.md
)
.
However, there are workflows where that is not needed, and only protecting from
force pushes and branch removal is useful. For those workflows, you can allow
everyone with write access to push to a protected branch by setting
"Allowed to push" to "Developers + Ma
st
ers".
"Allowed to push" to "Developers + Ma
intain
ers".
You can set the "Allowed to push" and "Allowed to merge" options while creating
a protected branch or afterwards by selecting the option you want from the
...
...
qa/qa/page/project/settings/protected_branches.rb
View file @
cfcc7043
...
...
@@ -41,7 +41,7 @@ module QA
end
def
allow_devs_and_masters_to_push
click_allow
(
:push
,
'Developers + Ma
st
ers'
)
click_allow
(
:push
,
'Developers + Ma
intain
ers'
)
end
def
allow_no_one_to_merge
...
...
@@ -49,7 +49,7 @@ module QA
end
def
allow_devs_and_masters_to_merge
click_allow
(
:merge
,
'Developers + Ma
st
ers'
)
click_allow
(
:merge
,
'Developers + Ma
intain
ers'
)
end
def
protect_branch
...
...
qa/qa/specs/features/repository/protected_branches_spec.rb
View file @
cfcc7043
...
...
@@ -35,7 +35,7 @@ module QA
end
expect
(
protected_branch
.
name
).
to
have_content
(
branch_name
)
expect
(
protected_branch
.
push_allowance
).
to
have_content
(
'Developers + Ma
st
ers'
)
expect
(
protected_branch
.
push_allowance
).
to
have_content
(
'Developers + Ma
intain
ers'
)
end
scenario
'users without authorization cannot push to protected branch'
do
...
...
spec/features/protected_branches_spec.rb
View file @
cfcc7043
...
...
@@ -72,7 +72,7 @@ feature 'Protected Branches', :js do
click_link
'No one'
find
(
".js-allowed-to-push"
).
click
wait_for_requests
click_link
'Developers + Ma
st
ers'
click_link
'Developers + Ma
intain
ers'
end
visit
project_protected_branches_path
(
project
)
...
...
@@ -82,7 +82,7 @@ feature 'Protected Branches', :js do
expect
(
page
.
find
(
".dropdown-toggle-text"
)).
to
have_content
(
"No one"
)
end
page
.
within
(
".js-allowed-to-push"
)
do
expect
(
page
.
find
(
".dropdown-toggle-text"
)).
to
have_content
(
"Developers + Ma
st
ers"
)
expect
(
page
.
find
(
".dropdown-toggle-text"
)).
to
have_content
(
"Developers + Ma
intain
ers"
)
end
end
end
...
...
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