group runners

app/views/projects/runners/_group_runners.html.haml

@@ -26,9 +26,9 @@
 
   - if can?(current_user, :admin_pipeline, @project.group)
     - group_link = link_to _('Group CI/CD settings'), group_settings_ci_cd_path(@project.group)
-    = _('Group masters can register group runners in the %{link}').html_safe % { link: group_link }
+    = _('Group maintainers can register group runners in the %{link}').html_safe % { link: group_link }
   - else
-    = _('Ask your group master to setup a group Runner.')
+    = _('Ask your group maintainer to setup a group Runner.')
 
 - else
   %h4.underlined-title

locale/gitlab.pot

@@ -439,7 +439,7 @@ msgstr ""
 msgid "Artifacts"
 msgstr ""
 
-msgid "Ask your group master to setup a group Runner."
+msgid "Ask your group maintainer to setup a group Runner."
 msgstr ""
 
 msgid "Assign custom color like #FF0000"
@@ -2237,7 +2237,7 @@ msgstr ""
 msgid "Group Runners"
 msgstr ""
 
-msgid "Group masters can register group runners in the %{link}"
+msgid "Group maintainers can register group runners in the %{link}"
 msgstr ""
 
 msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"

spec/features/runners_spec.rb

@@ -184,7 +184,7 @@ feature 'Runners' do
 
     given(:group) { create :group }
 
-    context 'as project and group master' do
+    context 'as project and group maintainer' do
       background do
         group.add_master(user)
       end
@@ -197,13 +197,13 @@ feature 'Runners' do
 
           expect(page).to have_content 'This group does not provide any group Runners yet'
 
-          expect(page).to have_content 'Group masters can register group runners in the Group CI/CD settings'
-          expect(page).not_to have_content 'Ask your group master to setup a group Runner'
+          expect(page).to have_content 'Group maintainers can register group runners in the Group CI/CD settings'
+          expect(page).not_to have_content 'Ask your group maintainer to setup a group Runner'
         end
       end
     end
 
-    context 'as project master' do
+    context 'as project maintainer' do
       context 'project without a group' do
         given(:project) { create :project }
 
@@ -223,8 +223,8 @@ feature 'Runners' do
 
           expect(page).to have_content 'This group does not provide any group Runners yet.'
 
-          expect(page).not_to have_content 'Group masters can register group runners in the Group CI/CD settings'
-          expect(page).to have_content 'Ask your group master to setup a group Runner.'
+          expect(page).not_to have_content 'Group maintainers can register group runners in the Group CI/CD settings'
+          expect(page).to have_content 'Ask your group maintainer to setup a group Runner.'
         end
       end