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

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

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

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

diff --cc app/models/account.rb
Simple merge

diff --cc app/views/stream_entries/_detailed_status.html.haml
index b488bd9ba73062eeccb1daaf31f34f9f6a251d81,94e081c84dc03f2e85aeee84931bf52e954c82f4..d88ec8280615574319eb28d1535275d04dfb338b
--- 1/app/views/stream_entries/_detailed_status.html.haml
--- 2/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@@ -17,16 -17,16 +17,16 @@@
        %p{ style: 'margin-bottom: 0' }<
          %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
          %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
-     .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }<
-       = Formatter.instance.format(status, custom_emojify: true)
-       - if !status.media_attachments.empty?
-         - if status.media_attachments.first.video?
-           - video = status.media_attachments.first
-           %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive?, width: 670, height: 380) }}<
-         - else
-           %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 380, sensitive: status.sensitive?, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, 'reduceMotion': current_account&.user&.setting_reduce_motion, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}<
-       - elsif status.preview_cards.first
-         %div{ data: { component: 'Card', props: Oj.dump('maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_cards.first, serializer: REST::PreviewCardSerializer).as_json) }}<
+     .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true)
+ 
+   - if !status.media_attachments.empty?
+     - if status.media_attachments.first.video?
+       - video = status.media_attachments.first
 -      %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive?, width: 670, height: 380, detailed: true) }}
++      %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive?, width: 670, height: 380, detailed: true) }}<
+     - else
 -      %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 380, sensitive: status.sensitive?, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, 'reduceMotion': current_account&.user&.setting_reduce_motion, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}
++      %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 380, sensitive: status.sensitive?, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, 'reduceMotion': current_account&.user&.setting_reduce_motion, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}<
+   - elsif status.preview_cards.first
+     %div{ data: { component: 'Card', props: Oj.dump('maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_cards.first, serializer: REST::PreviewCardSerializer).as_json) }}
  
    .detailed-status__meta
      %data.dt-published{ value: status.created_at.to_time.iso8601 }

diff --cc app/views/tags/show.html.haml
Simple merge

diff --cc config/application.rb
Simple merge

diff --cc config/locales/en.yml
index 804f9b199af4da8fe1b9213d8ec6d38d15192954,ce6d7ee4114ece375dfb4cf76dd58b4eef2cc84e..12284403cf2a16f4b1ac1b2f1fd16563745e0391
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -457,16 -456,11 +457,19 @@@ en
        expires_at: Expires
        uses: Uses
      title: Invite people
 +  keyword_mutes:
 +    add_keyword: Add keyword
 +    edit: Edit
 +    edit_keyword: Edit keyword
 +    keyword: Keyword
 +    match_whole_word: Match whole word
 +    remove: Remove
 +    remove_all: Remove all
    landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
    landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
+   lists:
+     errors:
+       limit: You have reached the maximum amount of lists
    media_attachments:
      validations:
        images_and_video: Cannot attach a video to a status that already contains images

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

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

diff --cc config/routes.rb
Simple merge

diff --cc db/schema.rb
Simple merge