Always install LDAP, CAS and SAML gems, because they don't require deps (#6663)

Fix #6534 PAM requires a system dependency so...
7 years ago · 4847149b6e
parent d7573fe584
commit 4847149b6e
1 changed files with 3 additions and 3 deletions
--- a/6
+++ b/6
@ -33,9 +33,9 @@ gem 'devise', '~> 4.4'
 gem 'devise-two-factor', '~> 3.0'

 gem 'devise_pam_authenticatable2', '~> 8.0', install_if: -> { ENV['PAM_ENABLED'] == 'true' }
-gem 'net-ldap', '~> 0.10', install_if: -> { ENV['LDAP_ENABLED'] == 'true' }
-gem 'omniauth-cas', '~> 1.1', install_if: -> { ENV['CAS_ENABLED'] == 'true' }
-gem 'omniauth-saml', '~> 1.10', install_if: -> { ENV['SAML_ENABLED'] == 'true' }
+gem 'net-ldap', '~> 0.10'
+gem 'omniauth-cas', '~> 1.1'
+gem 'omniauth-saml', '~> 1.10'
 gem 'omniauth', '~> 1.2'

 gem 'doorkeeper', '~> 4.2'