From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 7 Mar 2018 01:25:17 +0000 (+0100)
Subject: Always install LDAP, CAS and SAML gems, because they don't require deps (#6663)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4847149b6eb6fb1023c49f6e0d428290a906c6de;p=mastodon.git

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

Fix #6534

PAM requires a system dependency so...
---

diff --git a/Gemfile b/Gemfile
index 7db6e66b7..3fce2ddc7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'