Rename owners_and_masters

3 files changed, 11 insertions, 11 deletions

diff --git a/app/models/member.rb b/app/models/member.rb
index 5392a85b1e0..8bce4206410 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -71,7 +71,7 @@ class Member < ActiveRecord::Base
   scope :developers, -> { active.where(access_level: DEVELOPER) }
   scope :maintainers, -> { active.where(access_level: MASTER) }
   scope :owners,  -> { active.where(access_level: OWNER) }
-  scope :owners_and_masters,  -> { active.where(access_level: [OWNER, MASTER]) }
+  scope :owners_and_maintainers,  -> { active.where(access_level: [OWNER, MASTER]) }
 
   scope :order_name_asc, -> { left_join_users.reorder(Gitlab::Database.nulls_last_order('users.name', 'ASC')) }
   scope :order_name_desc, -> { left_join_users.reorder(Gitlab::Database.nulls_last_order('users.name', 'DESC')) }
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 5eaffee3430..423120e5606 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -268,9 +268,9 @@ class NotificationService
   def new_access_request(member)
     return true unless member.notifiable?(:subscription)
 
-    recipients = member.source.members.active_without_invites_and_requests.owners_and_masters
+    recipients = member.source.members.active_without_invites_and_requests.owners_and_maintainers
     if fallback_to_group_owners_masters?(recipients, member)
-      recipients = member.source.group.members.active_without_invites_and_requests.owners_and_masters
+      recipients = member.source.group.members.active_without_invites_and_requests.owners_and_maintainers
     end
 
     recipients.each { |recipient| deliver_access_request_email(recipient, member) }
diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb
index 1a49dafb8b9..5cd47f9af31 100644
--- a/spec/models/member_spec.rb
+++ b/spec/models/member_spec.rb
@@ -150,14 +150,14 @@ describe Member do
       it { is_expected.not_to include @blocked_developer }
     end
 
-    describe '.owners_and_masters' do
-      it { expect(described_class.owners_and_masters).to include @owner }
-      it { expect(described_class.owners_and_masters).to include @master }
-      it { expect(described_class.owners_and_masters).not_to include @invited_member }
-      it { expect(described_class.owners_and_masters).not_to include @accepted_invite_member }
-      it { expect(described_class.owners_and_masters).not_to include @requested_member }
-      it { expect(described_class.owners_and_masters).not_to include @accepted_request_member }
-      it { expect(described_class.owners_and_masters).not_to include @blocked_master }
+    describe '.owners_and_maintainers' do
+      it { expect(described_class.owners_and_maintainers).to include @owner }
+      it { expect(described_class.owners_and_maintainers).to include @master }
+      it { expect(described_class.owners_and_maintainers).not_to include @invited_member }
+      it { expect(described_class.owners_and_maintainers).not_to include @accepted_invite_member }
+      it { expect(described_class.owners_and_maintainers).not_to include @requested_member }
+      it { expect(described_class.owners_and_maintainers).not_to include @accepted_request_member }
+      it { expect(described_class.owners_and_maintainers).not_to include @blocked_master }
     end
 
     describe '.has_access' do