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 /config/application.rb | |
| parent | ab04be2f84132e6b6a83ca86cbabf2cdf13f5894 (diff) | |
| parent | ff6b8a6443c2c97d185927053bdc8816e0e03434 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index f63746e34..4319167dc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -17,6 +17,8 @@ require_relative '../lib/devise/ldap_authenticatable' Dotenv::Railtie.load +Bundler.require(:pam_authentication) if ENV['PAM_ENABLED'] == 'true' + require_relative '../lib/mastodon/redis_config' module Mastodon |