summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-09-19 21:15:13 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-09-19 21:15:13 -0400
commit69723d20024821fb4206e899ffa3acd2da690315 (patch)
tree55c9888c6652d9ca0ff78a6b584804cd47aed63e /app
parentce8f78a57168bbacb1320a4dc4e9e79b878221d4 (diff)
downloadgitlab-ce-69723d20024821fb4206e899ffa3acd2da690315.tar.gz
Devise 3.5.x deprecates `confirm!` in favor of `confirm`
Diffstat (limited to 'app')
-rw-r--r--app/controllers/admin/users_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 6092c79c254..a19b1abee27 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -56,7 +56,7 @@ class Admin::UsersController < Admin::ApplicationController
end
def confirm
- if user.confirm!
+ if user.confirm
redirect_to :back, notice: "Successfully confirmed"
else
redirect_to :back, alert: "Error occurred. User was not confirmed"