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

Conflicts: db/schema.rb
2018-04-14 09:12:50 -05:00
parent e3d0d72b29 78ed4ab75f
commit 813da6788e
18 changed files with 274 additions and 7 deletions
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -28,6 +28,14 @@
              %th.emojify>!=i[0]
              %td.emojify>!=i[1]

+      - unless account.fields.empty?
+        %table.account__header__fields
+          %tbody
+            - account.fields.each do |field|
+              %tr
+                %th.emojify= field.name
+                %td.emojify= Formatter.instance.format_field(account, field.value)
+
    .details-counters
      .counter{ class: active_nav_class(short_account_url(account)) }
        = link_to short_account_url(account), class: 'u-url u-uid' do