Merge remote-tracking branch 'upstream/develop' into feature/frontend_refactor

2020-03-10 16:24:43 -05:00
parent bccb9a6f9c fadc08fbad
commit 316b5c8d0f
19 changed files with 123 additions and 218 deletions
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -22,7 +22,7 @@
      = render 'tags/meta', tag: @tag, initial_state_json: @initial_state_json
    - elsif @stream_entry && @account
      = render 'stream_entries/meta', stream_entry: @stream_entry, account: @account
-    - elsif @account
+    - elsif @account && @account.local?
      = render 'accounts/meta', account: @account, older_url: nil, newer_url: nil

    %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
--- a/app/views/react/react.html.haml
+++ b/app/views/react/react.html.haml