Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-19 20:17:18 +00:00
parent ab04be2f84 ff6b8a6443
commit df70571bfe
22 changed files with 134 additions and 77 deletions
--- 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