Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4

Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss

diff --cc app/javascript/mastodon/actions/compose.js
Simple merge

diff --cc app/javascript/mastodon/components/status_action_bar.js
Simple merge

diff --cc app/javascript/mastodon/components/video_player.js
Simple merge

diff --cc app/javascript/mastodon/features/getting_started/index.js
index 2efab66f50761f3a1e5d894af976d23da7b7ea27,973c8a4aef81e8ef7648c7101164234a94e0fd82..9b729e03501e1e6655b4e6bc7d38ddb3b7a75833
--- 1/app/javascript/mastodon/features/getting_started/index.js
--- 2/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@@ -25,7 -23,7 +25,8 @@@ const messages = defineMessages(
    blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
    mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
    info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' },
 +  show_me_around: { id: 'getting_started.onboarding', defaultMessage: 'Show me around' },
+   pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
  });
  
  const mapStateToProps = state => ({

diff --cc app/javascript/mastodon/features/ui/index.js
Simple merge

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

diff --cc app/javascript/packs/public.js
index 2058fad9189bb5a3f7a7dff2766b4f9db72022a2,1a274c4cbd7ccbcb3d239fc89e644d197330a630..8b201ecf8ad33e23494733fb69d8d6cf8314ff86
--- 1/app/javascript/packs/public.js
--- 2/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@@ -1,5 -1,21 +1,22 @@@
  import loadPolyfills from '../mastodon/load_polyfills';
 +import { processBio } from '../glitch/util/bio_metadata';
+ import ready from '../mastodon/ready';
+ 
+ window.addEventListener('message', e => {
+   const data = e.data || {};
+ 
+   if (!window.parent || data.type !== 'setHeight') {
+     return;
+   }
+ 
+   ready(() => {
+     window.parent.postMessage({
+       type: 'setHeight',
+       id: data.id,
+       height: document.getElementsByTagName('html')[0].scrollHeight,
+     }, '*');
+   });
+ });
  
  function main() {
    const { length } = require('stringz');
@@@ -97,9 -115,9 +116,10 @@@
  
    delegate(document, '.account_note', 'input', ({ target }) => {
      const noteCounter = document.querySelector('.note-counter');
+ 
      if (noteCounter) {
 -      noteCounter.textContent = 160 - length(target.value);
 +      const noteWithoutMetadata = processBio(target.value).text;
 +      noteCounter.textContent = 500 - length(noteWithoutMetadata);
      }
    });
  

diff --cc app/javascript/styles/components.scss
index 5573552601a85a3b8ad6c81dd03bd6e5e9a9e1d7,75485d6b6245f7a2d0252f9b5527086567b810a2..16a87fcd8963d8d63070d1b2277e9f788db7a03b
--- 1/app/javascript/styles/components.scss
--- 2/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@@ -2701,37 -2345,8 +2701,21 @@@ button.icon-button.active i.fa-retweet 
    border: 0;
    width: 100%;
    height: 100%;
 +  justify-content: center;
 +  position: relative;
 +  text-align: center;
 +  z-index: 100;
 +
 +  .status__content > & {
 +    margin-top: 15px; // Add margin when used bare for NSFW video player
 +  }
 +
 +  &.full-width {
 +    margin-left: -68px;
 +    width: calc(100% + 80px);
 +  }
  }
  
- .media-spoiler__video {
-   align-items: center;
-   background: $base-overlay-background;
-   color: $primary-text-color;
-   cursor: pointer;
-   display: flex;
-   flex-direction: column;
-   border: 0;
-   width: 100%;
-   height: 100%;
-   justify-content: center;
-   position: relative;
-   text-align: center;
-   z-index: 100;
- }
- 
  .media-spoiler__warning {
    display: block;
    font-size: 14px;
@@@ -4294,14 -3803,10 +4278,17 @@@
    background-repeat: no-repeat;
    background-position: center;
    cursor: pointer;
 -  margin-top: 8px;
 +  margin-top: 15px;
    position: relative;
 +  width: 100%;
 +
 +  &.full-width {
 +    margin-left: -68px;
 +    width: calc(100% + 80px);
 +  }
++
+   border: 0;
+   display: block;
  }
  
  .media-spoiler-video-play-icon {

diff --cc app/services/post_status_service.rb
Simple merge