Merge remote-tracking branch 'origin/master' into merge-upstream

 Conflicts:
	app/controllers/authorize_follows_controller.rb
	app/javascript/styles/mastodon/components.scss

diff --cc app/controllers/authorize_follows_controller.rb
index 2d29bd37940c5fe4b17f0880acb66539f4fef428,7afe664d1be21d171af7bbc51f6115ec7f653fe4..eda50e07d14a695f6cfba9b1735d838bfe7cded4
--- 1/app/controllers/authorize_follows_controller.rb
--- 2/app/controllers/authorize_follows_controller.rb
+++ b/app/controllers/authorize_follows_controller.rb
@@@ -4,7 -4,7 +4,8 @@@ class AuthorizeFollowsController < Appl
    layout 'modal'
  
    before_action :authenticate_user!
 +  before_action :set_pack
+   before_action :set_body_classes
  
    def show
      @account = located_account || render(:error)

diff --cc app/controllers/remote_follow_controller.rb
Simple merge

diff --cc app/controllers/shares_controller.rb
index 81d279c8b4ccad7edabd6afd53302a15d29b6472,fc2469deaaf76babcf5e12b77d7df0b8eaca6be4..9c738fc4f12b1064c1a055bbbfad2ed0c9a1d320
--- 1/app/controllers/shares_controller.rb
--- 2/app/controllers/shares_controller.rb
+++ b/app/controllers/shares_controller.rb
@@@ -25,11 -24,7 +25,11 @@@ class SharesController < ApplicationCon
      }
    end
  
 +  def set_pack
 +    use_pack 'share'
 +  end
 +
    def set_body_classes
-     @body_classes = 'compose-standalone'
+     @body_classes = 'modal-layout compose-standalone'
    end
  end

diff --cc app/javascript/styles/mastodon/components.scss
index 0366d7cba870da60501a15befa4e994b233257ee,bc193a15adf1dabe249da67ffc084ac91970a5d8..a0316569084f67674c9308caa43bbd53cffa0cd3
--- 1/app/javascript/styles/mastodon/components.scss
--- 2/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@@ -1773,7 -1773,7 +1773,7 @@@
    }
  
    > .mastodon {
-     background: url('~images/mastodon-drawer.png') no-repeat left bottom / contain;
 -    background: url('../images/mastodon-ui.png') no-repeat left bottom / contain;
++    background: url('~images/mastodon-ui.png') no-repeat left bottom / contain;
      flex: 1;
    }
  }

diff --cc app/views/layouts/modal.html.haml
Simple merge