diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-06-08 13:21:22 +0900 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-06-22 10:24:05 +0800 |
| commit | 688e832bfad0dd405d511eaffe50b7ac865ea8f2 (patch) | |
| tree | 9422f1fea083b3386ac8e94650bb2ddd16a1ae2f | |
| parent | 887490be54c44edde4ac11a31d7e9f6c8fa692c2 (diff) | |
| download | gitlab-ce-688e832bfad0dd405d511eaffe50b7ac865ea8f2.tar.gz | |
more robust alias
| -rw-r--r-- | app/models/concerns/protected_ref_access.rb | 2 | ||||
| -rw-r--r-- | app/models/member.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/concerns/protected_ref_access.rb b/app/models/concerns/protected_ref_access.rb index 74ef25041e6..71b0c3468b9 100644 --- a/app/models/concerns/protected_ref_access.rb +++ b/app/models/concerns/protected_ref_access.rb @@ -14,7 +14,7 @@ module ProtectedRefAccess }.freeze included do - scope :master, -> { where(access_level: Gitlab::Access::MAINTAINER) } # @deprecated + scope :master, -> { maintainer } # @deprecated scope :maintainer, -> { where(access_level: Gitlab::Access::MAINTAINER) } scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) } diff --git a/app/models/member.rb b/app/models/member.rb index 7f177c5c431..3fa588cdb7f 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -70,10 +70,10 @@ class Member < ActiveRecord::Base scope :reporters, -> { active.where(access_level: REPORTER) } scope :developers, -> { active.where(access_level: DEVELOPER) } scope :maintainers, -> { active.where(access_level: MAINTAINER) } - scope :masters, -> { active.where(access_level: MAINTAINER) } # @deprecated + scope :masters, -> { maintainers } # @deprecated scope :owners, -> { active.where(access_level: OWNER) } scope :owners_and_maintainers, -> { active.where(access_level: [OWNER, MAINTAINER]) } - scope :owners_and_masters, -> { active.where(access_level: [OWNER, MAINTAINER]) } + scope :owners_and_masters, -> { owners_and_maintainers } 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')) } |