Merge branch '42751-rename-master-to-maintainer' into 'master'

Resolve "Rename the `Master` role to `Maintainer`"

Closes #42751

See merge request gitlab-org/gitlab-ce!19080

2 files changed, 3 insertions, 3 deletions

diff --git a/qa/qa/page/project/settings/protected_branches.rb b/qa/qa/page/project/settings/protected_branches.rb
index 63bc3aaa2bc..a0903c3c4dc 100644
--- a/qa/qa/page/project/settings/protected_branches.rb
+++ b/qa/qa/page/project/settings/protected_branches.rb
@@ -41,7 +41,7 @@ module QA
           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 @@ module QA
           end
 
           def allow_devs_and_masters_to_merge
-            click_allow(:merge, 'Developers + Masters')
+            click_allow(:merge, 'Developers + Maintainers')
           end
 
           def protect_branch
diff --git a/qa/qa/specs/features/repository/protected_branches_spec.rb b/qa/qa/specs/features/repository/protected_branches_spec.rb
index 406b2772b64..9e438aa3c30 100644
--- a/qa/qa/specs/features/repository/protected_branches_spec.rb
+++ b/qa/qa/specs/features/repository/protected_branches_spec.rb
@@ -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