Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream added settings where we had extra glitch-soc-specific settings.
  Added upstream's new settings.
- `app/models/user.rb`:
  Upstream added settings where we had extra glitch-soc-specific settings.
  Added upstream's new settings.
- `config/i18n-tasks.yml`:
  Not a real conflict, just a new upstream line too textually close to
  a glitch-soc-only line.
  Ported upstream's change.

diff --cc Gemfile
index 4c8cd2f5a7ed70ebc9dc9a57d49d41d63394a472,0e924b78d8c4f5ee9baa18e8273220344fb7a2fc..09dd1c2e2e2d9544292f8809081efdcba53da4b3
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -98,12 -98,10 +98,12 @@@ gem 'json-ld
  gem 'json-ld-preloaded', '~> 3.2'
  gem 'rdf-normalize', '~> 0.5'
  
 +gem 'redcarpet', '~> 3.5'
 +
  group :development, :test do
-   gem 'fabrication', '~> 2.27'
+   gem 'fabrication', '~> 2.28'
    gem 'fuubar', '~> 2.5'
-   gem 'i18n-tasks', '~> 0.9', require: false
+   gem 'i18n-tasks', '~> 1.0', require: false
    gem 'pry-byebug', '~> 3.9'
    gem 'pry-rails', '~> 0.3'
    gem 'rspec-rails', '~> 5.1'

diff --cc Gemfile.lock
index 04572ad75ef326e7b99ec74dd27a6bfeb525dc3e,e19bfde09d19622a3e7ba6bc3f1e55d5532b15d9..3d815cd7b959057e17037bc80bed71720c6f8f47
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -278,9 -286,7 +286,9 @@@ GE
        hamlit (>= 1.2.0)
        railties (>= 4.0.1)
      hashdiff (1.0.1)
-     hashie (4.1.0)
+     hashie (5.0.0)
 +    hcaptcha (7.1.0)
 +      json
      highline (2.0.3)
      hiredis (0.6.3)
      hkdf (0.3.0)
@@@ -760,9 -768,8 +771,9 @@@ DEPENDENCIE
    fog-core (<= 2.1.0)
    fog-openstack (~> 0.3)
    fuubar (~> 2.5)
-   gitlab-omniauth-openid-connect (~> 0.5.0)
+   gitlab-omniauth-openid-connect (~> 0.9.1)
    hamlit-rails (~> 0.2)
 +  hcaptcha (~> 7.1)
    hiredis (~> 0.6)
    htmlentities (~> 4.3)
    http (~> 5.0)

diff --cc app/controllers/api/v1/statuses_controller.rb
Simple merge

diff --cc app/controllers/settings/preferences_controller.rb
index 1fddd087b23151ac587742472a30623895177164,bfe651bc66755453317c43c24c65514dfdcba9ed..669ed00c662c7748685c687187d70140bc3c3f71
--- 1/app/controllers/settings/preferences_controller.rb
--- 2/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@@ -57,7 -54,8 +57,8 @@@ class Settings::PreferencesController 
        :setting_use_pending_items,
        :setting_trends,
        :setting_crop_images,
-       notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag trending_link trending_status),
+       :setting_always_send_emails,
 -      notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag appeal),
++      notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag trending_link trending_status appeal),
        interactions: %i(must_be_follower must_be_following must_be_following_dm)
      )
    end

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/mastodon/locales/pl.json
Simple merge

diff --cc app/lib/user_settings_decorator.rb
Simple merge

diff --cc app/models/trends/statuses.rb
Simple merge

diff --cc app/models/user.rb
index 5dd93519c87b2f0d529550027fa37f6eddc5bea9,9da7b2639eed4a7629e5bf2c497c75b213fe7238..5c1f9504ab221fb238f144d4e907e65e8f68371a
--- 1/app/models/user.rb
--- 2/app/models/user.rb
+++ b/app/models/user.rb
@@@ -126,11 -126,11 +126,11 @@@ class User < ApplicationRecor
  
    has_many :session_activations, dependent: :destroy
  
 -  delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal,
 -           :reduce_motion, :system_font_ui, :noindex, :theme, :display_media,
 +  delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :favourite_modal, :delete_modal,
 +           :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_media, :hide_followers_count,
             :expand_spoilers, :default_language, :aggregate_reblogs, :show_application,
             :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images,
-            :disable_swiping, :default_content_type, :system_emoji_font,
 -           :disable_swiping, :always_send_emails,
++           :disable_swiping, :always_send_emails, :default_content_type, :system_emoji_font,
             to: :settings, prefix: :setting, allow_nil: false
  
    attr_reader :invite_code

diff --cc app/views/settings/preferences/notifications/show.html.haml
index e01cd077ff1fc1f2a495d2bd4e0e762ed551bb5c,42754a85209a7ba4141241333908b097cd8c09f0..38e8b171e7d55e51288aa096d096253dad79de6c
--- 1/app/views/settings/preferences/notifications/show.html.haml
--- 2/app/views/settings/preferences/notifications/show.html.haml
+++ b/app/views/settings/preferences/notifications/show.html.haml
@@@ -24,9 -24,10 +24,12 @@@
          = ff.input :appeal, as: :boolean, wrapper: :with_label
          = ff.input :pending_account, as: :boolean, wrapper: :with_label
          = ff.input :trending_tag, as: :boolean, wrapper: :with_label
 +        = ff.input :trending_link, as: :boolean, wrapper: :with_label
 +        = ff.input :trending_status, as: :boolean, wrapper: :with_label
  
+   .fields-group
+     = f.input :setting_always_send_emails, as: :boolean, wrapper: :with_label
+ 
    .fields-group
      = f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|
        = ff.input :digest, as: :boolean, wrapper: :with_label

diff --cc config/i18n-tasks.yml
index f41b8dfff8b5e14697c6b5890f1a57b990fa0eae,42a7afb33cecab87568a27b5f9cc5785407d1b8a..7139bcea7c6834b4c8f002bd9f063d994a47be6f
--- 1/config/i18n-tasks.yml
--- 2/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@@ -59,7 -59,7 +59,8 @@@ ignore_unused
    - 'errors.429'
    - 'admin.accounts.roles.*'
    - 'admin.action_logs.actions.*'
 +  - 'themes.*'
+   - 'admin_mailer.new_appeal.actions.*'
    - 'statuses.attached.*'
    - 'move_handler.carry_{mutes,blocks}_over_text'
    - 'notification_mailer.*'

diff --cc config/settings.yml
index 51016d322065f9c1b21c08f63b987f346b33c57a,eaa05071e112ff4d87a51a767674aeaa68d6c552..bb2720ec24fcf0f249fa8872862021ef1c1d3130
--- 1/config/settings.yml
--- 2/config/settings.yml
+++ b/config/settings.yml
@@@ -40,21 -36,19 +40,22 @@@ defaults: &default
    use_pending_items: false
    trends: true
    trendable_by_default: false
 +  trending_status_cw: true
    crop_images: true
    notification_emails:
-     follow: false
+     follow: true
      reblog: false
      favourite: false
-     mention: false
+     mention: true
      follow_request: true
      digest: true
      report: true
      pending_account: true
      trending_tag: true
 +    trending_link: false
 +    trending_status: false
      appeal: true
+   always_send_emails: false
    interactions:
      must_be_follower: false
      must_be_following: false