diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-01 19:23:14 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-01 19:23:14 +0200 |
| commit | 45deca65b3fb8e9f19818e3db7d315cab0572d1a (patch) | |
| tree | 1b9bab6ec764e8a6600d245595facd5694287e16 /config/application.rb | |
| parent | 39a0622de70dc24275808cee9526658bd68a55ed (diff) | |
| parent | 6d23d40420e4548778f3ca4ed9e8cb16e0eb0073 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 8348649df..a3c37b042 100644 --- a/config/application.rb +++ b/config/application.rb @@ -7,12 +7,15 @@ require 'rails/all' Bundler.require(*Rails.groups) require_relative '../app/lib/exceptions' +require_relative '../lib/redis/namespace_extensions' require_relative '../lib/paperclip/url_generator_extensions' require_relative '../lib/paperclip/attachment_extensions' +require_relative '../lib/paperclip/media_type_spoof_detector_extensions' require_relative '../lib/paperclip/lazy_thumbnail' require_relative '../lib/paperclip/gif_transcoder' require_relative '../lib/paperclip/video_transcoder' require_relative '../lib/paperclip/type_corrector' +require_relative '../lib/paperclip/response_with_limit_adapter' require_relative '../lib/mastodon/snowflake' require_relative '../lib/mastodon/version' require_relative '../lib/devise/two_factor_ldap_authenticatable' |