CE upstream - 2018-06-06 15:12 UTC

Files to resolve:

• @lulalala Please resolve (UU) app/views/projects/project_members/index.html.haml
• @reprazent Please resolve (UU) config/routes/api.rb
• @lulalala Please resolve (UU) doc/api/namespaces.md
• @lulalala Please resolve (UU) doc/api/protected_branches.md
• @axil Please resolve (UU) doc/ci/variables/README.md
• @lulalala Please resolve (UU) doc/system_hooks/system_hooks.md
• @lulalala Please resolve (UU) doc/user/project/protected_branches.md
• @lulalala Please resolve (UU) lib/api/protected_branches.rb
• @lulalala Please resolve (UU) locale/gitlab.pot

Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-06-06 branch.

More detailed instructions

Thanks in advance!

@lulalala After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.

Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!

app/models/concerns/protected_ref_access.rb

@@ -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