summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Walker <bwalker@gitlab.com>2017-10-28 17:04:20 +0200
committerdigitalMoksha <bwalker@gitlab.com>2017-11-03 12:07:24 +0100
commit50190a9432d4b346b56499db440178194c8a7cf9 (patch)
treef6b7ff2c52cabda9c4a5f87f40515e4339806d38
parent80e5d52630aa8f9a57742a54004caa45c7903ad6 (diff)
downloadgitlab-ce-50190a9432d4b346b56499db440178194c8a7cf9.tar.gz
re-enable skip_confirmation
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 167212c904d..a5559ecbc00 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -438,7 +438,7 @@ class User < ActiveRecord::Base
end
def skip_confirmation=(bool)
- # skip_confirmation! if bool
+ skip_confirmation! if bool
end
def generate_reset_token