diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-01 18:03:51 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-01 18:03:51 +0200 |
| commit | 7c8359b7441c2631ceec3bd3783a9761646a9f99 (patch) | |
| tree | f684e27f73b13e2322cc80e91a1b0f6ac7d1b4a4 /app/models/member.rb | |
| parent | 6782cd3cf6bd298c0c26538db35704bf13fcabb3 (diff) | |
| download | gitlab-ce-7c8359b7441c2631ceec3bd3783a9761646a9f99.tar.gz | |
started refactoring some stuff based on MR feedback
Diffstat (limited to 'app/models/member.rb')
| -rw-r--r-- | app/models/member.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index bef0b545c70..9a56d3d2181 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -19,10 +19,10 @@ class Member < ActiveRecord::Base include Sortable + include Importable include Gitlab::Access attr_accessor :raw_invite_token - attr_accessor :importing belongs_to :created_by, class_name: "User" belongs_to :user @@ -55,10 +55,10 @@ class Member < ActiveRecord::Base scope :owners, -> { where(access_level: OWNER) } before_validation :generate_invite_token, on: :create, if: -> (member) { member.invite_email.present? } - after_create :send_invite, if: :invite?, unless: :importing - after_create :create_notification_setting, unless: [:invite?, :importing] - after_create :post_create_hook, unless: [:invite?, :importing] - after_update :post_update_hook, unless: [:invite?, :importing] + after_create :send_invite, if: :invite?, unless: :importing? + after_create :create_notification_setting, unless: [:invite?, :importing?] + after_create :post_create_hook, unless: [:invite?, :importing?] + after_update :post_update_hook, unless: [:invite?, :importing?] after_destroy :post_destroy_hook, unless: :invite? delegate :name, :username, :email, to: :user, prefix: true |