Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream

Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.

spec/presenters/account_relationships_presenter_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe AccountRelationshipsPresenter do
     let(:account_ids)        { [Fabricate(:account).id] }
     let(:default_map)        { { 1 => true } }
 
-    context 'options are not set' do
+    context 'when options are not set' do
       let(:options) { {} }
 
       it 'sets default maps' do
@@ -32,7 +32,7 @@ RSpec.describe AccountRelationshipsPresenter do
       end
     end
 
-    context 'options[:following_map] is set' do
+    context 'when options[:following_map] is set' do
       let(:options) { { following_map: { 2 => true } } }
 
       it 'sets @following merged with default_map and options[:following_map]' do
@@ -40,7 +40,7 @@ RSpec.describe AccountRelationshipsPresenter do
       end
     end
 
-    context 'options[:followed_by_map] is set' do
+    context 'when options[:followed_by_map] is set' do
       let(:options) { { followed_by_map: { 3 => true } } }
 
       it 'sets @followed_by merged with default_map and options[:followed_by_map]' do
@@ -48,7 +48,7 @@ RSpec.describe AccountRelationshipsPresenter do
       end
     end
 
-    context 'options[:blocking_map] is set' do
+    context 'when options[:blocking_map] is set' do
       let(:options) { { blocking_map: { 4 => true } } }
 
       it 'sets @blocking merged with default_map and options[:blocking_map]' do
@@ -56,7 +56,7 @@ RSpec.describe AccountRelationshipsPresenter do
       end
     end
 
-    context 'options[:muting_map] is set' do
+    context 'when options[:muting_map] is set' do
       let(:options) { { muting_map: { 5 => true } } }
 
       it 'sets @muting merged with default_map and options[:muting_map]' do
@@ -64,7 +64,7 @@ RSpec.describe AccountRelationshipsPresenter do
       end
     end
 
-    context 'options[:requested_map] is set' do
+    context 'when options[:requested_map] is set' do
       let(:options) { { requested_map: { 6 => true } } }
 
       it 'sets @requested merged with default_map and options[:requested_map]' do
@@ -72,7 +72,7 @@ RSpec.describe AccountRelationshipsPresenter do
       end
     end
 
-    context 'options[:requested_by_map] is set' do
+    context 'when options[:requested_by_map] is set' do
       let(:options) { { requested_by_map: { 6 => true } } }
 
       it 'sets @requested merged with default_map and options[:requested_by_map]' do
@@ -80,7 +80,7 @@ RSpec.describe AccountRelationshipsPresenter do
       end
     end
 
-    context 'options[:domain_blocking_map] is set' do
+    context 'when options[:domain_blocking_map] is set' do
       let(:options) { { domain_blocking_map: { 7 => true } } }
 
       it 'sets @domain_blocking merged with default_map and options[:domain_blocking_map]' do

spec/presenters/status_relationships_presenter_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe StatusRelationshipsPresenter do
     let(:status_ids)         { statuses.map(&:id) + statuses.map(&:reblog_of_id).compact }
     let(:default_map)        { { 1 => true } }
 
-    context 'options are not set' do
+    context 'when options are not set' do
       let(:options) { {} }
 
       it 'sets default maps' do
@@ -30,7 +30,7 @@ RSpec.describe StatusRelationshipsPresenter do
       end
     end
 
-    context 'options[:reblogs_map] is set' do
+    context 'when options[:reblogs_map] is set' do
       let(:options) { { reblogs_map: { 2 => true } } }
 
       it 'sets @reblogs_map merged with default_map and options[:reblogs_map]' do
@@ -38,7 +38,7 @@ RSpec.describe StatusRelationshipsPresenter do
       end
     end
 
-    context 'options[:favourites_map] is set' do
+    context 'when options[:favourites_map] is set' do
       let(:options) { { favourites_map: { 3 => true } } }
 
       it 'sets @favourites_map merged with default_map and options[:favourites_map]' do
@@ -46,7 +46,7 @@ RSpec.describe StatusRelationshipsPresenter do
       end
     end
 
-    context 'options[:bookmarks_map] is set' do
+    context 'when options[:bookmarks_map] is set' do
       let(:options) { { bookmarks_map: { 4 => true } } }
 
       it 'sets @bookmarks_map merged with default_map and options[:bookmarks_map]' do
@@ -54,7 +54,7 @@ RSpec.describe StatusRelationshipsPresenter do
       end
     end
 
-    context 'options[:mutes_map] is set' do
+    context 'when options[:mutes_map] is set' do
       let(:options) { { mutes_map: { 5 => true } } }
 
       it 'sets @mutes_map merged with default_map and options[:mutes_map]' do
@@ -62,7 +62,7 @@ RSpec.describe StatusRelationshipsPresenter do
       end
     end
 
-    context 'options[:pins_map] is set' do
+    context 'when options[:pins_map] is set' do
       let(:options) { { pins_map: { 6 => true } } }
 
       it 'sets @pins_map merged with default_map and options[:pins_map]' do