update master symbol

6 files changed, 27 insertions, 27 deletions

diff --git a/db/fixtures/development/12_snippets.rb b/db/fixtures/development/12_snippets.rb
index 9093bece53e..a9f4069a0f8 100644
--- a/db/fixtures/development/12_snippets.rb
+++ b/db/fixtures/development/12_snippets.rb
@@ -17,7 +17,7 @@ class Member < ActiveRecord::Base
   scope :guests, -> { where(access_level: GUEST) }
   scope :reporters, -> { where(access_level: REPORTER) }
   scope :developers, -> { where(access_level: DEVELOPER) }
-  scope :masters,  -> { where(access_level: MAINTAINER) }
+  scope :maintainers,  -> { where(access_level: MAINTAINER) }
   scope :owners,  -> { where(access_level: OWNER) }
 
   delegate :name, :username, :email, to: :user, prefix: true
diff --git a/lib/tasks/gitlab/bulk_add_permission.rake b/lib/tasks/gitlab/bulk_add_permission.rake
index d66421fd81d..26cbf0740b6 100644
--- a/lib/tasks/gitlab/bulk_add_permission.rake
+++ b/lib/tasks/gitlab/bulk_add_permission.rake
@@ -1,6 +1,6 @@
 namespace :gitlab do
   namespace :import do
-    desc "GitLab | Add all users to all projects (admin users are added as masters)"
+    desc "GitLab | Add all users to all projects (admin users are added as maintainers)"
     task all_users_to_all_projects: :environment  do |t, args|
       user_ids = User.where(admin: false).pluck(:id)
       admin_ids = User.where(admin: true).pluck(:id)
diff --git a/spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb b/spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb
index 81ec3fccca1..482c507a844 100644
--- a/spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb
+++ b/spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb
@@ -24,7 +24,7 @@ feature 'User creates blob in new project', :js do
     end
   end
 
-  describe 'as a master' do
+  describe 'as a maintainer' do
     before do
       project.add_maintainer(user)
     end
diff --git a/spec/models/project_team_spec.rb b/spec/models/project_team_spec.rb
index ed9ea853c40..3ca71e1e49e 100644
--- a/spec/models/project_team_spec.rb
+++ b/spec/models/project_team_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe ProjectTeam do
-  let(:master) { create(:user) }
+  let(:maintainer) { create(:user) }
   let(:reporter) { create(:user) }
   let(:guest) { create(:user) }
   let(:nonmember) { create(:user) }
@@ -10,13 +10,13 @@ describe ProjectTeam do
     let(:project) { create(:project) }
 
     before do
-      project.add_maintainer(master)
+      project.add_maintainer(maintainer)
       project.add_reporter(reporter)
       project.add_guest(guest)
     end
 
     describe 'members collection' do
-      it { expect(project.team.maintainers).to include(master) }
+      it { expect(project.team.maintainers).to include(maintainer) }
       it { expect(project.team.maintainers).not_to include(guest) }
       it { expect(project.team.maintainers).not_to include(reporter) }
       it { expect(project.team.maintainers).not_to include(nonmember) }
@@ -53,10 +53,10 @@ describe ProjectTeam do
 
     describe 'members collection' do
       it { expect(project.team.reporters).to include(reporter) }
-      it { expect(project.team.maintainers).to include(master) }
-      it { expect(project.team.maintainers).to include(guest) }
-      it { expect(project.team.maintainers).not_to include(reporter) }
-      it { expect(project.team.maintainers).not_to include(nonmember) }
+      it { expect(project.team.masters).to include(master) }
+      it { expect(project.team.masters).to include(guest) }
+      it { expect(project.team.masters).not_to include(reporter) }
+      it { expect(project.team.masters).not_to include(nonmember) }
     end
 
     describe 'access methods' do
@@ -67,8 +67,8 @@ describe ProjectTeam do
       it { expect(project.team.maintainer?(nonmember)).to be_falsey }
       it { expect(project.team.member?(nonmember)).to be_falsey }
       it { expect(project.team.member?(guest)).to be_truthy }
-      it { expect(project.team.member?(guest, Gitlab::Access::MAINTAINER)).to be_truthy }
-      it { expect(project.team.member?(reporter, Gitlab::Access::MAINTAINER)).to be_falsey }
+      it { expect(project.team.member?(guest, Gitlab::Access::MASTER)).to be_truthy }
+      it { expect(project.team.member?(reporter, Gitlab::Access::MASTER)).to be_falsey }
       it { expect(project.team.member?(nonmember, Gitlab::Access::GUEST)).to be_falsey }
     end
   end
@@ -216,7 +216,7 @@ describe ProjectTeam do
           project.request_access(requester)
         end
 
-        it { expect(project.team.max_member_access(master.id)).to eq(Gitlab::Access::MAINTAINER) }
+        it { expect(project.team.max_member_access(master.id)).to eq(Gitlab::Access::MASTER) }
         it { expect(project.team.max_member_access(reporter.id)).to eq(Gitlab::Access::REPORTER) }
         it { expect(project.team.max_member_access(guest.id)).to eq(Gitlab::Access::GUEST) }
         it { expect(project.team.max_member_access(nonmember.id)).to eq(Gitlab::Access::NO_ACCESS) }
@@ -263,7 +263,7 @@ describe ProjectTeam do
         group.request_access(requester)
       end
 
-      it { expect(project.team.max_member_access(master.id)).to eq(Gitlab::Access::MAINTAINER) }
+      it { expect(project.team.max_member_access(master.id)).to eq(Gitlab::Access::MASTER) }
       it { expect(project.team.max_member_access(reporter.id)).to eq(Gitlab::Access::REPORTER) }
       it { expect(project.team.max_member_access(guest.id)).to eq(Gitlab::Access::GUEST) }
       it { expect(project.team.max_member_access(nonmember.id)).to eq(Gitlab::Access::NO_ACCESS) }
@@ -318,12 +318,12 @@ describe ProjectTeam do
     end
 
     it 'checks for the correct minimum level access' do
-      expect(group_project.team.member?(developer, Gitlab::Access::MAINTAINER)).to be(false)
-      expect(group_project.team.member?(master, Gitlab::Access::MAINTAINER)).to be(true)
-      expect(members_project.team.member?(developer, Gitlab::Access::MAINTAINER)).to be(false)
-      expect(members_project.team.member?(master, Gitlab::Access::MAINTAINER)).to be(true)
-      expect(shared_project.team.member?(developer, Gitlab::Access::MAINTAINER)).to be(false)
-      expect(shared_project.team.member?(master, Gitlab::Access::MAINTAINER)).to be(false)
+      expect(group_project.team.member?(developer, Gitlab::Access::MASTER)).to be(false)
+      expect(group_project.team.member?(master, Gitlab::Access::MASTER)).to be(true)
+      expect(members_project.team.member?(developer, Gitlab::Access::MASTER)).to be(false)
+      expect(members_project.team.member?(master, Gitlab::Access::MASTER)).to be(true)
+      expect(shared_project.team.member?(developer, Gitlab::Access::MASTER)).to be(false)
+      expect(shared_project.team.member?(master, Gitlab::Access::MASTER)).to be(false)
       expect(shared_project.team.member?(developer, Gitlab::Access::DEVELOPER)).to be(true)
       expect(shared_project.team.member?(master, Gitlab::Access::DEVELOPER)).to be(true)
     end
@@ -352,12 +352,12 @@ describe ProjectTeam do
 
     let(:expected) do
       {
-        master.id => Gitlab::Access::MAINTAINER,
+        master.id => Gitlab::Access::MASTER,
         reporter.id => Gitlab::Access::REPORTER,
         promoted_guest.id => Gitlab::Access::DEVELOPER,
         guest.id => Gitlab::Access::GUEST,
         group_developer.id => Gitlab::Access::DEVELOPER,
-        second_developer.id => Gitlab::Access::MAINTAINER,
+        second_developer.id => Gitlab::Access::MASTER,
         user_without_access.id => Gitlab::Access::NO_ACCESS
       }
     end
@@ -379,7 +379,7 @@ describe ProjectTeam do
 
       project.project_group_links.create(
         group: second_group,
-        group_access: Gitlab::Access::MAINTAINER
+        group_access: Gitlab::Access::MASTER
       )
 
       second_group.add_maintainer(second_developer)
diff --git a/spec/serializers/deploy_key_entity_spec.rb b/spec/serializers/deploy_key_entity_spec.rb
index cb1cf2ee458..01264cf7fb5 100644
--- a/spec/serializers/deploy_key_entity_spec.rb
+++ b/spec/serializers/deploy_key_entity_spec.rb
@@ -44,7 +44,7 @@ describe DeployKeyEntity do
     it { expect(entity.as_json).to eq(expected_result) }
   end
 
-  describe 'returns can_edit true if user is a master of project' do
+  describe 'returns can_edit true if user is a maintainer of project' do
     before do
       project.add_maintainer(user)
     end
diff --git a/spec/views/projects/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb b/spec/views/projects/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb
index 6e7d8db99c4..5d60d6bc5e7 100644
--- a/spec/views/projects/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb
+++ b/spec/views/projects/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'projects/pipeline_schedules/_pipeline_schedule' do
   let(:owner) { create(:user) }
-  let(:master) { create(:user) }
+  let(:maintainer) { create(:user) }
   let(:project) { create(:project) }
   let(:pipeline_schedule) { create(:ci_pipeline_schedule, :nightly, project: project) }
 
@@ -17,10 +17,10 @@ describe 'projects/pipeline_schedules/_pipeline_schedule' do
 
   context 'taking ownership of schedule' do
     context 'when non-owner is signed in' do
-      let(:user) { master }
+      let(:user) { maintainer }
 
       before do
-        allow(view).to receive(:can?).with(master, :take_ownership_pipeline_schedule, pipeline_schedule).and_return(true)
+        allow(view).to receive(:can?).with(maintainer, :take_ownership_pipeline_schedule, pipeline_schedule).and_return(true)
       end
 
       it 'non-owner can take ownership of pipeline' do