Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2017-09-20 13:31:35 +0300
committerJames Lopez <james@jameslopez.es>2017-09-28 09:46:39 +0300
commitfaa95ba4fbeb93e6af19770f7aade54aa9d30304 (patch)
treeb0efd9b3f19f9f92fc6502e099220be2b356e658 /app/services/users
parent7188975cb54a2b6902544340a91f94aa1fa82d3c (diff)
fix users update service
Diffstat (limited to 'app/services/users')
-rw-r--r--app/services/users/update_service.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index 05cb1655325..9f013af38dc 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -11,10 +11,12 @@ module Users
def execute(validate: true, &block)
yield(@user) if block_given?
+ user_exists = @user.persisted?
+
assign_attributes(&block)
if @user.save(validate: validate)
- notify_success
+ notify_success(user_exists)
else
error(@user.errors.full_messages.uniq.join('. '))
end
@@ -30,8 +32,8 @@ module Users
private
- def notify_success
- notify_new_user(@user, nil) unless @user.persisted?
+ def notify_success(user_exists)
+ notify_new_user(@user, nil) unless user_exists
success
end