mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-15 15:46:08 +10:00
Merge branch 'user-account-created-email' into 'master'
Only send "Account was created for you" email when created by admin. See #1985 cc @sytse See merge request !1517
This commit is contained in:
+1
-1
@@ -559,7 +559,7 @@ class User < ActiveRecord::Base
|
||||
|
||||
def post_create_hook
|
||||
log_info("User \"#{self.name}\" (#{self.email}) was created")
|
||||
notification_service.new_user(self, @reset_token)
|
||||
notification_service.new_user(self, @reset_token) if self.created_by_id
|
||||
system_hook_service.execute_hooks_for(self, :create)
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user