rename association

2 files changed, 8 insertions, 8 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index c9ab7eb03d4..8c855195a6d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -99,7 +99,7 @@ class User < ActiveRecord::Base
   has_many :group_members, -> { where(requested_at: nil) }, source: 'GroupMember'
   has_many :groups, through: :group_members
   has_many :owned_groups, -> { where(members: { access_level: Gitlab::Access::OWNER }) }, through: :group_members, source: :group
-  has_many :masters_groups, -> { where(members: { access_level: Gitlab::Access::MAINTAINER }) }, through: :group_members, source: :group
+  has_many :maintainers_groups, -> { where(members: { access_level: Gitlab::Access::MAINTAINER }) }, through: :group_members, source: :group
 
   # Projects
   has_many :groups_projects,          through: :groups, source: :projects
@@ -728,7 +728,7 @@ class User < ActiveRecord::Base
   end
 
   def several_namespaces?
-    owned_groups.any? || masters_groups.any?
+    owned_groups.any? || maintainers_groups.any?
   end
 
   def namespace_id
@@ -974,7 +974,7 @@ class User < ActiveRecord::Base
   end
 
   def manageable_groups
-    union_sql = Gitlab::SQL::Union.new([owned_groups.select(:id), masters_groups.select(:id)]).to_sql
+    union_sql = Gitlab::SQL::Union.new([owned_groups.select(:id), maintainers_groups.select(:id)]).to_sql
 
     # Update this line to not use raw SQL when migrated to Rails 5.2.
     # Either ActiveRecord or Arel constructions are fine.
@@ -1027,7 +1027,7 @@ class User < ActiveRecord::Base
         .select(:runner_id)
 
       group_runner_ids = Ci::RunnerNamespace
-        .where(namespace_id: owned_or_masters_groups.select(:id))
+        .where(namespace_id: owned_or_maintainers_groups.select(:id))
         .select(:runner_id)
 
       union = Gitlab::SQL::Union.new([project_runner_ids, group_runner_ids])
@@ -1236,8 +1236,8 @@ class User < ActiveRecord::Base
       !terms_accepted?
   end
 
-  def owned_or_masters_groups
-    union = Gitlab::SQL::Union.new([owned_groups, masters_groups])
+  def owned_or_maintainers_groups
+    union = Gitlab::SQL::Union.new([owned_groups, maintainers_groups])
     Group.from("(#{union.to_sql}) namespaces")
   end
 
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 423120e5606..373bf31913e 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -269,7 +269,7 @@ class NotificationService
     return true unless member.notifiable?(:subscription)
 
     recipients = member.source.members.active_without_invites_and_requests.owners_and_maintainers
-    if fallback_to_group_owners_masters?(recipients, member)
+    if fallback_to_group_owners_maintainers?(recipients, member)
       recipients = member.source.group.members.active_without_invites_and_requests.owners_and_maintainers
     end
 
@@ -528,7 +528,7 @@ class NotificationService
     mailer.member_access_requested_email(member.real_source_type, member.id, recipient.user.notification_email).deliver_later
   end
 
-  def fallback_to_group_owners_masters?(recipients, member)
+  def fallback_to_group_owners_maintainers?(recipients, member)
     return false if recipients.present?
 
     member.source.respond_to?(:group) && member.source.group