diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
| commit | 1b8fcd4df52c8d715f89180faea8205310f197ae (patch) | |
| tree | 705b8b59bafdd26cb96983e2da0104e8b7308ea7 /config/application.rb | |
| parent | ee00da01d2e4cc455b92f1f4a7c9142c73048433 (diff) | |
| parent | ecf06d7e821a4b8f4585f1b6f0e39c595ed047ce (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index b1cc7727a..88d0eccf2 100644 --- a/config/application.rb +++ b/config/application.rb @@ -13,6 +13,7 @@ require_relative '../lib/paperclip/video_transcoder' require_relative '../lib/paperclip/audio_transcoder' require_relative '../lib/mastodon/snowflake' require_relative '../lib/mastodon/version' +require_relative '../lib/devise/ldap_authenticatable' Dotenv::Railtie.load |