diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-07-11 14:36:08 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-07-11 14:36:08 +0000 |
| commit | a63bce1a4b55bc6cbafb9dec12d33028521489e9 (patch) | |
| tree | ee9466e6b06536a65d4e851f4096679c6f968d1e /app/models/member.rb | |
| parent | 1bf54e092783f7ad388225d32ab79ac1e845559c (diff) | |
| download | gitlab-ce-a63bce1a4b55bc6cbafb9dec12d33028521489e9.tar.gz | |
Resolve "Rename the `Master` role to `Maintainer`" Backend
Diffstat (limited to 'app/models/member.rb')
| -rw-r--r-- | app/models/member.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index 68572f2e33a..00a13a279a9 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -69,9 +69,11 @@ class Member < ActiveRecord::Base scope :guests, -> { active.where(access_level: GUEST) } scope :reporters, -> { active.where(access_level: REPORTER) } scope :developers, -> { active.where(access_level: DEVELOPER) } - scope :masters, -> { active.where(access_level: MASTER) } + scope :maintainers, -> { active.where(access_level: MAINTAINER) } + scope :masters, -> { maintainers } # @deprecated 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, MAINTAINER]) } + scope :owners_and_masters, -> { owners_and_maintainers } # @deprecated 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')) } |