kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

fix specs

Browse source
This commit is contained in:
James Lopez 2017-06-22 16:54:54 +02:00
parent 12dc3992ea
commit e2e0b175ae
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/admin/users_controller.rb
View file

@ -156,11 +156,11 @@ class Admin::UsersController < Admin::ApplicationController
respond_to do |format| respond_to do |format|
if success if success
format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") } format.html { redirect_back_or_admin_user(notice: 'Successfully removed email.') }
format.json { head :ok } format.json { head :ok }
else else
format.html { redirect_back_or_admin_user(alert: result[:message]) } format.html { redirect_back_or_admin_user(alert: 'There was an error removing the e-mail.') }
format.json { render json: result[:message], status: result[:status] } format.json { render json: 'There was an error removing the e-mail.', status: 400 }
end end
end end
end end

2
app/services/users/update_service.rb
View file

@ -10,7 +10,7 @@ module Users
def execute(skip_authorization: false, validate: true, &block) def execute(skip_authorization: false, validate: true, &block)
assign_attributes(skip_authorization, &block) assign_attributes(skip_authorization, &block)
if @user.save(validate: validate) || @user.errors.empty? if @user.save(validate: validate)
success success
else else
error(@user.errors.full_messages.uniq.join('. ')) error(@user.errors.full_messages.uniq.join('. '))