summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorBrett Walker <brett@digitalmoksha.com>2017-09-24 19:52:49 +0200
committerBrett Walker <brett@digitalmoksha.com>2017-09-24 19:52:49 +0200
commitd97b577a1bee80bd79209d2e6d501d1cd93debcc (patch)
tree660edfe661e2e8c3e14aa3a1986dfecc70eb7d46 /config
parentd7d335c05b9ae359b72f59c31bbe5ed059df7f52 (diff)
downloadgitlab-ce-d97b577a1bee80bd79209d2e6d501d1cd93debcc.tar.gz
must now set the devise default scope (since we now have an :email scope)
and rubocop fixes
Diffstat (limited to 'config')
-rw-r--r--config/initializers/devise.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 3aed2136f1b..2ca02c16497 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -175,7 +175,7 @@ Devise.setup do |config|
# Configure the default scope given to Warden. By default it's the first
# devise role declared in your routes (usually :user).
- # config.default_scope = :user
+ config.default_scope = :user # now have an :email scope as well, so set the default
# Configure sign_out behavior.
# Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).