diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-06 12:16:36 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-06 12:16:36 +0200 |
| commit | 4f24eb2aa670877faeef0f486af00d74e007ad01 (patch) | |
| tree | 3b8c9ccbe779050db829565910e8652392af4dcf /app/controllers/admin/users_controller.rb | |
| parent | c6799b0e1ecd1b7373f0ea23195e18c7ad5c199d (diff) | |
| parent | fff36a8b8965e4bddd8020caf5072e79bf131a74 (diff) | |
| download | gitlab-ce-merge-notifs.tar.gz | |
Merge branch 'master' into merge-notifsmerge-notifs
Diffstat (limited to 'app/controllers/admin/users_controller.rb')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 770fe00af51..6092c79c254 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -55,6 +55,14 @@ class Admin::UsersController < Admin::ApplicationController end end + def confirm + if user.confirm! + redirect_to :back, notice: "Successfully confirmed" + else + redirect_to :back, alert: "Error occurred. User was not confirmed" + end + end + def disable_two_factor user.disable_two_factor! redirect_to admin_user_path(user), |