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

diff --cc .circleci/config.yml
Simple merge

diff --cc .env.production.sample
Simple merge

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/auth/confirmations_controller.rb
index 1d6e4ec197caee981f47dd7eb987ef4a715dc325,89852526998dbedcedbcee3ace41ef724f4eb7e5..4e89446c7c8ca48c5db4cc5a8efc550ca9e8555f
--- 1/app/controllers/auth/confirmations_controller.rb
--- 2/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@@ -4,16 -4,22 +4,27 @@@ class Auth::ConfirmationsController < D
    layout 'auth'
  
    before_action :set_body_classes
 +  before_action :set_pack
+   before_action :require_unconfirmed!
  
    skip_before_action :require_functional!
  
+   def new
+     super
+ 
+     resource.email = current_user.unconfirmed_email || current_user.email if user_signed_in?
+   end
+ 
    private
  
 +  def set_pack
 +    use_pack 'auth'
 +  end
 +
+   def require_unconfirmed!
+     redirect_to edit_user_registration_path if user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank?
+   end
+ 
    def set_body_classes
      @body_classes = 'lighter'
    end

diff --cc app/javascript/core/admin.js
index 3f6f187bc71acf463ed6a90016822332ae7a3515,42c747d2efc50e379edee125c2717fdf5dbfb5d8..ffdabe67436ae0cde5b0b19241a4bc6fb6cb7d43
--- 1/app/javascript/core/admin.js
--- 2/app/javascript/packs/admin.js
+++ b/app/javascript/core/admin.js
@@@ -1,6 -1,5 +1,7 @@@
 +//  This file will be loaded on admin pages, regardless of theme.
 +
  import { delegate } from 'rails-ujs';
+ import ready from '../mastodon/ready';
  
  const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
  

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

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

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

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

diff --cc app/serializers/activitypub/note_serializer.rb
Simple merge

diff --cc app/views/directories/index.html.haml
Simple merge

diff --cc config/environments/production.rb
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge