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
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-05-10 00:39:16 +0300
committerRobert Speicher <rspeicher@gmail.com>2015-05-10 00:39:16 +0300
commit11989d62d09a628015c68c161898dfabcd966825 (patch)
treeeeaaf6c4a7ec221f6f7f7d56a9a3dca2ffa6ab38 /app/models/user.rb
parent21be1b415262773e099176dbb3da9846bc36a0ca (diff)
Remove unnecessary User#login accessor override
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 70972eb2715..b45c7f20e52 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -674,9 +674,4 @@ class User < ActiveRecord::Base
true
end
-
- # Used to populate the hidden form field during Two-factor authentication
- def login
- username || email
- end
end