Huge replace of old users_project and users_group references

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/app/models/member.rb b/app/models/member.rb
index 13827db175b..7dc13c18bf3 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -8,11 +8,13 @@ class Member < ActiveRecord::Base
   validates :user, presence: true
   validates :source, presence: true
   validates :user_id, uniqueness: { scope: [:source_type, :source_id], message: "already exists in source" }
-  validates :access_level, inclusion: { in: Gitlab::Access.values }, presence: true
+  validates :access_level, inclusion: { in: Gitlab::Access.all_values }, presence: true
 
-  scope :guests, -> { where(group_access: GUEST) }
-  scope :reporters, -> { where(group_access: REPORTER) }
-  scope :developers, -> { where(group_access: DEVELOPER) }
-  scope :masters,  -> { where(group_access: MASTER) }
-  scope :owners,  -> { where(group_access: OWNER) }
+  scope :guests, -> { where(access_level: GUEST) }
+  scope :reporters, -> { where(access_level: REPORTER) }
+  scope :developers, -> { where(access_level: DEVELOPER) }
+  scope :masters,  -> { where(access_level: MASTER) }
+  scope :owners,  -> { where(access_level: OWNER) }
+
+  delegate :name, :username, :email, to: :user, prefix: true
 end