From: David Yip <yipdw@member.fsf.org>
Date: Fri, 17 Nov 2017 04:52:37 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/master' into gs-master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b28b405b9763a0bb3df653b51e6d084b42e9a54d;p=mastodon.git

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

b28b405b9763a0bb3df653b51e6d084b42e9a54d
diff --cc app/views/accounts/_header.html.haml
index 47ee02cf0,e4c258acd..94ec5ae5b
--- a/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)) }