summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2017-06-22 16:54:54 +0200
committerJames Lopez <james@jameslopez.es>2017-06-23 11:41:43 +0200
commite2e0b175ae43bef44ba5fdc45b4a719aaae83422 (patch)
tree8a578fa45ba5fbd5da456c1fd439f21220f5cec8 /app/controllers/admin
parent12dc3992ea189452532587a2b30b8765c0f09381 (diff)
downloadgitlab-ce-e2e0b175ae43bef44ba5fdc45b4a719aaae83422.tar.gz
fix specs
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/users_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 97ae68495c7..c44f381664f 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -156,11 +156,11 @@ class Admin::UsersController < Admin::ApplicationController
respond_to do |format|
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 }
else
- format.html { redirect_back_or_admin_user(alert: result[:message]) }
- format.json { render json: result[:message], status: result[:status] }
+ format.html { redirect_back_or_admin_user(alert: 'There was an error removing the e-mail.') }
+ format.json { render json: 'There was an error removing the e-mail.', status: 400 }
end
end
end