Commit cfcc7043 authored by Mark Chao's avatar Mark Chao

Rename “Developers + Masters”

parent a8b570d8
......@@ -8,8 +8,8 @@ module ProtectedRefAccess
].freeze
HUMAN_ACCESS_LEVELS = {
Gitlab::Access::MASTER => "Masters".freeze,
Gitlab::Access::DEVELOPER => "Developers + Masters".freeze,
Gitlab::Access::MASTER => "Maintainers".freeze,
Gitlab::Access::DEVELOPER => "Developers + Maintainers".freeze,
Gitlab::Access::NO_ACCESS => "No one".freeze
}.freeze
......
......@@ -115,13 +115,13 @@ Example response:
"push_access_levels": [
{
"access_level": 30,
"access_level_description": "Developers + Masters"
"access_level_description": "Developers + Maintainers"
}
],
"merge_access_levels": [
{
"access_level": 30,
"access_level_description": "Developers + Masters"
"access_level_description": "Developers + Maintainers"
}
]
}
......
......@@ -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 + Masters", to require _everyone_ to submit a merge request for
to "Developers + Maintainers", 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 + Masters".
"Allowed to push" to "Developers + Maintainers".
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
......
......@@ -41,7 +41,7 @@ def allow_no_one_to_push
end
def allow_devs_and_masters_to_push
click_allow(:push, 'Developers + Masters')
click_allow(:push, 'Developers + Maintainers')
end
def allow_no_one_to_merge
......@@ -49,7 +49,7 @@ def allow_no_one_to_merge
end
def allow_devs_and_masters_to_merge
click_allow(:merge, 'Developers + Masters')
click_allow(:merge, 'Developers + Maintainers')
end
def protect_branch
......
......@@ -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 + Masters')
expect(protected_branch.push_allowance).to have_content('Developers + Maintainers')
end
scenario 'users without authorization cannot push to protected branch' do
......
......@@ -72,7 +72,7 @@
click_link 'No one'
find(".js-allowed-to-push").click
wait_for_requests
click_link 'Developers + Masters'
click_link 'Developers + Maintainers'
end
visit project_protected_branches_path(project)
......@@ -82,7 +82,7 @@
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 + Masters")
expect(page.find(".dropdown-toggle-text")).to have_content("Developers + Maintainers")
end
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment