Merge remote-tracking branch 'tootsuite/master'

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

diff --cc app/views/accounts/_header.html.haml
index 94ec5ae5b9cae129ddce2940df464b58e89b2dc4,d4081af645cdea34ea09fe982cdfe2e8e1e72162..b0062752c2eab9ee4123e949df09c3e8b59294db
--- 1/app/views/accounts/_header.html.haml
--- 2/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@@ -1,7 -1,6 +1,7 @@@
 +- processed_bio = FrontmatterHandler.instance.process_bio Formatter.instance.simplified_format account
  .card.h-card.p-author{ style: "background-image: url(#{account.header.url(:original)})" }
    .card__illustration
-     - unless account.memorial?
+     - unless account.memorial? || account.moved?
        - if user_signed_in? && current_account.id != account.id && !current_account.requested?(account)
          .controls
            - if current_account.following?(account)
@@@ -27,23 -26,19 +27,23 @@@
        %small
          %span @#{account.local_username_and_domain}
          = fa_icon('lock') if account.locked?
--
-     - if account.user_admin?
-       .roles
-         .account-role.admin
-           = t 'accounts.roles.admin'
-     - elsif account.user_moderator?
-       .roles
-         .account-role.moderator
-           = t 'accounts.roles.moderator'
+     - if Setting.show_staff_badge
+       - if account.user_admin?
+         .roles
+           .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/settings.yml
index 6983484d0e4a56953c06fdcd7ff0678d06b74328,5a0170fb4df461159cefbb06cf81cb28e58ca300..670a992bbb8721b777b8e9fc013d1510d5908f18
--- 1/config/settings.yml
--- 2/config/settings.yml
+++ b/config/settings.yml
@@@ -16,7 -16,8 +16,8 @@@ defaults: &default
    open_registrations: true
    closed_registrations_message: ''
    open_deletion: true
 -  timeline_preview: true
 +  timeline_preview: false
+   show_staff_badge: true
    default_sensitive: false
    unfollow_modal: false
    boost_modal: false

diff --cc db/schema.rb
Simple merge

diff --cc spec/models/concerns/account_interactions_spec.rb
Simple merge

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