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

Conflicts:
- `README.md`: our READMEs are entirely different and
  upstream's has been updated. Kept our README.

2 files changed, 16 insertions, 2 deletions

diff --git a/lib/mastodon/maintenance_cli.rb b/lib/mastodon/maintenance_cli.rb
index 9f1eaf263..8e2084e33 100644
--- a/lib/mastodon/maintenance_cli.rb
+++ b/lib/mastodon/maintenance_cli.rb
@@ -14,7 +14,7 @@ module Mastodon
     end
 
     MIN_SUPPORTED_VERSION = 2019_10_01_213028
-    MAX_SUPPORTED_VERSION = 2021_03_08_133107
+    MAX_SUPPORTED_VERSION = 2021_05_07_001928
 
     # Stubs to enjoy ActiveRecord queries while not depending on a particular
     # version of the code/database
@@ -42,6 +42,8 @@ module Mastodon
     class CustomEmojiCategory < ApplicationRecord; end
     class Bookmark < ApplicationRecord; end
     class WebauthnCredential < ApplicationRecord; end
+    class FollowRecommendationSuppression < ApplicationRecord; end
+    class CanonicalEmailBlock < ApplicationRecord; end
 
     class PreviewCard < ApplicationRecord
       self.inheritance_column = false
@@ -88,6 +90,7 @@ module Mastodon
         ]
         owned_classes << AccountDeletionRequest if ActiveRecord::Base.connection.table_exists?(:account_deletion_requests)
         owned_classes << AccountNote if ActiveRecord::Base.connection.table_exists?(:account_notes)
+        owned_classes << FollowRecommendationSuppression if ActiveRecord::Base.connection.table_exists?(:follow_recommendation_suppressions)
 
         owned_classes.each do |klass|
           klass.where(account_id: other_account.id).find_each do |record|
@@ -111,6 +114,12 @@ module Mastodon
             end
           end
         end
+
+        if ActiveRecord::Base.connection.table_exists?(:canonical_email_blocks)
+          CanonicalEmailBlock.where(reference_account_id: other_account.id).find_each do |record|
+            record.update_attribute(:reference_account_id, id)
+          end
+        end
       end
     end
 
@@ -466,6 +475,11 @@ module Mastodon
 
       @prompt.say 'Restoring tags indexes…'
       ActiveRecord::Base.connection.add_index :tags, 'lower((name)::text)', name: 'index_tags_on_name_lower', unique: true
+
+      if ActiveRecord::Base.connection.indexes(:tags).any? { |i| i.name == 'index_tags_on_name_lower_btree' }
+        @prompt.say 'Reindexing textual indexes on tags…'
+        ActiveRecord::Base.connection.execute('REINDEX INDEX index_tags_on_name_lower_btree;')
+      end
     end
 
     def deduplicate_webauthn_credentials!
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 6a79453f1..ff0e694b7 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
     end
 
     def flags
-      'rc2'
+      ''
     end
 
     def suffix