diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 3 | ||||
| -rw-r--r-- | config/i18n-tasks.yml | 1 | ||||
| -rw-r--r-- | config/initializers/paperclip.rb | 1 | ||||
| -rw-r--r-- | config/initializers/redis.rb | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
6 files changed, 8 insertions, 3 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' diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 1e223fbde..e09f4262b 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -61,6 +61,7 @@ ignore_unused: - 'admin.action_logs.actions.*' - 'themes.*' - 'statuses.attached.*' + - 'move_handler.carry_{mutes,blocks}_over_text' ignore_inconsistent_interpolations: - '*.one' diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index ebb009065..b4849370d 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true Paperclip::DataUriAdapter.register +Paperclip::ResponseWithLimitAdapter.register Paperclip.interpolates :filename do |attachment, style| if style == :original diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb index 510194044..7573fc9f7 100644 --- a/config/initializers/redis.rb +++ b/config/initializers/redis.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -Redis.exists_returns_integer = false - redis_connection = Redis.new( url: ENV['REDIS_URL'], driver: :hiredis diff --git a/config/locales/en.yml b/config/locales/en.yml index b3906a127..2cae0a3e3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -941,6 +941,8 @@ en: moderation: title: Moderation move_handler: + carry_blocks_over_text: This user moved from %{acct}, which you had blocked. + carry_mutes_over_text: This user moved from %{acct}, which you had muted. copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:' notification_mailer: digest: diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index f84b6c884..0a8a6fd62 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -56,7 +56,7 @@ en: domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored email_domain_block: domain: This can be the domain name that shows up in the e-mail address, the MX record that domain resolves to, or IP of the server that MX record resolves to. Those will be checked upon user sign-up and the sign-up will be rejected. - with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blacklisted + with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blocked featured_tag: name: 'You might want to use one of these:' form_challenge: |