Merge tag 'v1.6.0' into sync/upstream

diff --cc app/javascript/mastodon/features/ui/components/modal_root.js
index cd605d7b2dcb4ccc8f02b4ed2458d265c0a90627,a09c9d9b370db98186249a63af7c82750bfbc60d..4588cd5fda56ec7310ed8335aa6426455dff2098
--- 1/app/javascript/mastodon/features/ui/components/modal_root.js
--- 2/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@@ -5,26 -5,24 +5,26 @@@ import spring from 'react-motion/lib/sp
  import BundleContainer from '../containers/bundle_container';
  import BundleModalError from './bundle_modal_error';
  import ModalLoading from './modal_loading';
- import ActionsModal from '../components/actions_modal';
+ import ActionsModal from './actions_modal';
+ import MediaModal from './media_modal';
+ import VideoModal from './video_modal';
+ import BoostModal from './boost_modal';
+ import ConfirmationModal from './confirmation_modal';
  import {
-   MediaModal,
    OnboardingModal,
-   VideoModal,
-   BoostModal,
-   ConfirmationModal,
    ReportModal,
 +  SettingsModal,
    EmbedModal,
  } from '../../../features/ui/util/async-components';
  
  const MODAL_COMPONENTS = {
-   'MEDIA': MediaModal,
+   'MEDIA': () => Promise.resolve({ default: MediaModal }),
    'ONBOARDING': OnboardingModal,
-   'VIDEO': VideoModal,
-   'BOOST': BoostModal,
-   'CONFIRM': ConfirmationModal,
+   'VIDEO': () => Promise.resolve({ default: VideoModal }),
+   'BOOST': () => Promise.resolve({ default: BoostModal }),
+   'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
    'REPORT': ReportModal,
 +  'SETTINGS': SettingsModal,
    'ACTIONS': () => Promise.resolve({ default: ActionsModal }),
    'EMBED': EmbedModal,
  };

diff --cc app/javascript/mastodon/features/ui/util/async-components.js
Simple merge

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

diff --cc config/settings.yml
Simple merge