summaryrefslogtreecommitdiff
path: root/app/controllers/sessions_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-21 19:02:23 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:31:57 -0600
commit8a4d68c53e9c58ad7f8dce1494f7976292b2f929 (patch)
tree773814f7079c626cafabc229f929cafbe4d4b2e7 /app/controllers/sessions_controller.rb
parent7ea641b6d0882fc782a7eb493daf8b66d076924b (diff)
downloadgitlab-ce-8a4d68c53e9c58ad7f8dce1494f7976292b2f929.tar.gz
Enable Style/ConditionalAssignment
Diffstat (limited to 'app/controllers/sessions_controller.rb')
-rw-r--r--app/controllers/sessions_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 93a180b9036..529a8c9b4b4 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -15,10 +15,10 @@ class SessionsController < Devise::SessionsController
def new
set_minimum_password_length
- if Gitlab.config.ldap.enabled
- @ldap_servers = Gitlab::LDAP::Config.servers
+ @ldap_servers = if Gitlab.config.ldap.enabled
+ Gitlab::LDAP::Config.servers
else
- @ldap_servers = []
+ []
end
super