diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-06-17 12:38:49 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-06-17 14:29:11 -0300 |
| commit | e5aa902860fcc2380fd25a6a4f0736dae159eba3 (patch) | |
| tree | ba3c678a476bc7153490da412ebd64223c155c1c /app/controllers/sessions_controller.rb | |
| parent | ab236c76247d83c190b148acbffa48f244414553 (diff) | |
| parent | ae4491b42181f7195199fd6ac9273891d6e48263 (diff) | |
| download | gitlab-ce-issue_12758.tar.gz | |
Merge master into issue_12758issue_12758
Diffstat (limited to 'app/controllers/sessions_controller.rb')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index dae8f7b1447..17aed816cbd 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -40,7 +40,7 @@ class SessionsController < Devise::SessionsController # Handle an "initial setup" state, where there's only one user, it's an admin, # and they require a password change. def check_initial_setup - return unless User.count == 1 + return unless User.limit(2).count == 1 # Count as much 2 to know if we have exactly one user = User.admins.last |