Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-25 18:10:14 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-25 18:10:14 +0400
commit9d92433a7c83432657faf4c02839bba1ba6f22ac (patch)
tree1b3ab9210534b9074d35b7307cc1801dc870e548 /config
parent1496c01521b46265660de72209fd81b585639bcf (diff)
login with both email or username
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 9c3976335ff..5714407f393 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -23,7 +23,7 @@ Devise.setup do |config|
# session. If you need permissions, you should implement that in a before filter.
# You can also supply a hash where the value is a boolean determining whether
# or not authentication should be aborted when the value is not present.
- # config.authentication_keys = [ :email ]
+ config.authentication_keys = [ :login ]
# Configure parameters from the request object used for authentication. Each entry
# given should be a request method and it will automatically be passed to the