diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-19 20:17:18 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-19 20:17:18 +0000 |
| commit | df70571bfe8aa18cfb44661fb02cc1e2e256c4e8 (patch) | |
| tree | cf6269fa490b4533999d68acb969a1a86447666b /Gemfile | |
| parent | ab04be2f84132e6b6a83ca86cbabf2cdf13f5894 (diff) | |
| parent | ff6b8a6443c2c97d185927053bdc8816e0e03434 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 22192db4d..195ff6e14 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,9 @@ gem 'cld3', '~> 3.2.0' gem 'devise', '~> 4.4' gem 'devise-two-factor', '~> 3.0' -gem 'devise_pam_authenticatable2', '~> 8.0', install_if: -> { ENV['PAM_ENABLED'] == 'true' } +group :pam_authentication, optional: true do + gem 'devise_pam_authenticatable2', '~> 9.0' +end gem 'net-ldap', '~> 0.10' gem 'omniauth-cas', '~> 1.1' gem 'omniauth-saml', '~> 1.10' |