diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-18 11:21:03 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-03-18 11:21:03 +0100 |
| commit | 3091a184ca7ca0f788b42209db95b5d80db31b32 (patch) | |
| tree | c5a94d591b8713b77b8d23b8ba5124f650f99800 /config | |
| parent | 00fe0f6cb4a736bbb5e633c567ddf7ac9a09ce69 (diff) | |
| parent | 34096bc6ea788fece267116ef190e0d218f77b18 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/test.rb | 6 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb index 1328e155a..493b041eb 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -51,6 +51,12 @@ Rails.application.configure do config.i18n.default_locale = :en config.i18n.fallbacks = true + + config.to_prepare do + # Force Status to always be SHAPE_TOO_COMPLEX + # Ref: https://github.com/mastodon/mastodon/issues/23644 + 10.times { |i| Status.allocate.instance_variable_set(:"@ivar_#{i}", nil) } + end end Paperclip::Attachment.default_options[:path] = "#{Rails.root}/spec/test_files/:class/:id_partition/:style.:extension" diff --git a/config/locales/en.yml b/config/locales/en.yml index c6b113956..592450100 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1691,6 +1691,7 @@ en: title: Welcome aboard, %{name}! users: follow_limit_reached: You cannot follow more than %{limit} people + go_to_sso_account_settings: Go to your identity provider's account settings invalid_otp_token: Invalid two-factor code otp_lost_help_html: If you lost access to both, you may get in touch with %{email} seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available. |