diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-06 13:26:41 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-06 13:27:19 +0200 |
| commit | f2af30f19534c639c17fa5356ab1c18f518f2e98 (patch) | |
| tree | f7aa6556d235244308b9c0645c1bef189982fa40 /app/controllers | |
| parent | 45ca39e81bf857cdb58b1a184b8fab0e56c200f7 (diff) | |
| download | gitlab-ce-f2af30f19534c639c17fa5356ab1c18f518f2e98.tar.gz | |
Skip email confirmation when set by admin or via LDAP.skip-email-reconfirmation
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 693970e5349..b4c011f213c 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -72,8 +72,8 @@ class Admin::UsersController < Admin::ApplicationController end respond_to do |format| + user.skip_reconfirmation! if user.update_attributes(user_params_with_pass) - user.confirm! format.html { redirect_to [:admin, user], notice: 'User was successfully updated.' } format.json { head :ok } else |