diff options
| author | Nihad Abbasov <narkoz.2008@gmail.com> | 2013-10-16 22:31:46 +0500 |
|---|---|---|
| committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2013-10-16 22:31:46 +0500 |
| commit | 12420a2256168a122b3a1f5a2c974df52fe802ec (patch) | |
| tree | e78b9da0d3729f1f79f1d377959eed508c29973f /app/models/user.rb | |
| parent | e09cc195a7400187e7b59f7ff24273962d9912d7 (diff) | |
| download | gitlab-ce-12420a2256168a122b3a1f5a2c974df52fe802ec.tar.gz | |
refactor by_username_or_id
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 22292de40a6..df14cf34e85 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -199,11 +199,7 @@ class User < ActiveRecord::Base end def by_username_or_id(name_or_id) - if (name_or_id.is_a?(Integer)) - User.find_by_id(name_or_id) - else - User.find_by_username(name_or_id) - end + where('username = ? OR id = ?', name_or_id, name_or_id).first end def build_user(attrs = {}, options= {}) |