diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-16 06:08:48 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-16 06:08:48 +0300 |
| commit | ec5622b1a45c9cdce86d1a44aa3a4be6f4eb71bc (patch) | |
| tree | 76ee33a97e11d9273370404bbb1646ef2902f437 /app | |
| parent | e0d7302b73bd0ed959f985200dd809a5c31144e3 (diff) | |
| parent | 4a62a0f01a0058d1d260ddecb0341f48b5b2e26d (diff) | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 5f98bfb7870..d4018f0c897 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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 |