Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.

lib/mastodon/accounts_cli.rb

@@ -545,7 +545,7 @@ module Mastodon
         User.pending.find_each(&:approve!)
         say('OK', :green)
       elsif options[:number]&.positive?
-        User.pending.limit(options[:number]).each(&:approve!)
+        User.pending.order(created_at: :asc).limit(options[:number]).each(&:approve!)
         say('OK', :green)
       elsif username.present?
         account = Account.find_local(username)

lib/mastodon/ip_blocks_cli.rb

@@ -108,9 +108,9 @@ module Mastodon
       IpBlock.where(severity: :no_access).find_each do |ip_block|
         case options[:format]
         when 'nginx'
-          puts "deny #{ip_block.ip}/#{ip_block.ip.prefix};"
+          say "deny #{ip_block.ip}/#{ip_block.ip.prefix};"
         else
-          puts "#{ip_block.ip}/#{ip_block.ip.prefix}"
+          say "#{ip_block.ip}/#{ip_block.ip.prefix}"
         end
       end
     end

lib/mastodon/snowflake.rb

@@ -146,7 +146,7 @@ module Mastodon::Snowflake
     private
 
     def already_defined?
-      connection.execute(<<~SQL).values.first.first
+      connection.execute(<<~SQL.squish).values.first.first
         SELECT EXISTS(
           SELECT * FROM pg_proc WHERE proname = 'timestamp_id'
         );