diff options
| author | James Lopez <james@jameslopez.es> | 2017-06-22 11:27:37 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-06-23 11:41:42 +0200 |
| commit | c9fd3dc42c462ce2551f6a9630035b4df00bc366 (patch) | |
| tree | 5e4bd5226fff9fa00ba9db17056d21a59db527d7 /app/services/users/update_service.rb | |
| parent | 785cbb79e255c8369ca5eb916207304f39d188ad (diff) | |
| download | gitlab-ce-c9fd3dc42c462ce2551f6a9630035b4df00bc366.tar.gz | |
more refactoring based on feedback
Diffstat (limited to 'app/services/users/update_service.rb')
| -rw-r--r-- | app/services/users/update_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb index a1db1dbc583..56e8739ab5e 100644 --- a/app/services/users/update_service.rb +++ b/app/services/users/update_service.rb @@ -10,7 +10,7 @@ module Users def execute(skip_authorization: false, validate: true, &block) assign_attributes(skip_authorization, &block) - if @user.save(validate: validate) || !@user.changed? && @user.errors.empty? + if @user.save(validate: validate) || @user.errors.empty? success else error(@user.errors.full_messages.uniq.join('. ')) @@ -18,9 +18,9 @@ module Users end def execute!(skip_authorization: false, &block) - assign_attributes(skip_authorization, &block) + result = execute(*args, &block) - @user.save! if @user.changed? + raise SomeCustomException(result[:message]) unless result[:status] == :success end private |