about summary refs log tree commit diff
path: root/app/views/stream_entries
diff options
context:
space:
mode:
authorreverite <samantha@chalker.io>2019-01-29 21:13:22 -0800
committerreverite <samantha@chalker.io>2019-01-29 21:13:22 -0800
commit3510128c51f615634350a93dfb19053519d65454 (patch)
tree85bac2a16c9c2371679d43311d9d6b069c988e94 /app/views/stream_entries
parentc5b97d18762dce34a95ca42e9335e672c66953c0 (diff)
parentc2ccdad102cae9bc3dc94d1d6c6f306ca0366370 (diff)
Merge branch 'master' into production
Diffstat (limited to 'app/views/stream_entries')
-rw-r--r--app/views/stream_entries/_detailed_status.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index 18265e110..e123d657f 100644
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -39,7 +39,7 @@
     = link_to TagManager.instance.url_for(status), class: 'detailed-status__datetime u-url u-uid', target: stream_link_target, rel: 'noopener' do
       %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
     ·
-    - if status.application
+    - if status.application && @account.user&.setting_show_application
       - if status.application.website.blank?
         %strong.detailed-status__application= status.application.name
       - else