import uploads. Fixed a few things to do with members, triggers, etc...

1 files changed, 5 insertions, 4 deletions

diff --git a/app/models/member.rb b/app/models/member.rb
index cca82da89f1..bef0b545c70 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -22,6 +22,7 @@ class Member < ActiveRecord::Base
   include Gitlab::Access
 
   attr_accessor :raw_invite_token
+  attr_accessor :importing
 
   belongs_to :created_by, class_name: "User"
   belongs_to :user
@@ -54,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?
-  after_create :create_notification_setting, unless: :invite?
-  after_create :post_create_hook, unless: :invite?
-  after_update :post_update_hook, unless: :invite?
+  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