logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 4847149b6eb6fb1023c49f6e0d428290a906c6de
parent: d7573fe584ea622e22f5a68f2bf120b7682c49f7
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Wed,  7 Mar 2018 02:25:17 +0100

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

Fix #6534

PAM requires a system dependency so...

Diffstat:

MGemfile6+++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 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'