Merge remote-tracking branch 'origin/master' into gs-master

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

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

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

diff --cc app/views/accounts/_header.html.haml
index 47ee02cf04904495449132b887759b84a281933e,e4c258acdaf84ba2c97478573117f3b0ce28eccf..94ec5ae5b9cae129ddce2940df464b58e89b2dc4
--- 1/app/views/accounts/_header.html.haml
--- 2/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@@ -30,16 -29,15 +30,20 @@@
  
      - if account.user_admin?
        .roles
-         .account-role
+         .account-role.admin
            = t 'accounts.roles.admin'
 -
+     - elsif account.user_moderator?
+       .roles
+         .account-role.moderator
+           = t 'accounts.roles.moderator'
      .bio
 -      .account__header__content.p-note.emojify= Formatter.instance.simplified_format(account)
 +      .account__header__content.p-note.emojify!=processed_bio[:text]
 +      - if processed_bio[:metadata].length > 0
 +        %table.metadata<
 +          - processed_bio[:metadata].each do |i|
 +            %tr.metadata-item><
 +              %th.emojify>!=i[0]
 +              %td.emojify>!=i[1]
  
      .details-counters
        .counter{ class: active_nav_class(short_account_url(account)) }

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

diff --cc config/routes.rb
Simple merge

diff --cc spec/models/status_spec.rb
Simple merge