diff options
| author | reverite <samantha@chalker.io> | 2019-01-29 21:12:50 -0800 |
|---|---|---|
| committer | reverite <samantha@chalker.io> | 2019-01-29 21:12:50 -0800 |
| commit | c2ccdad102cae9bc3dc94d1d6c6f306ca0366370 (patch) | |
| tree | 85bac2a16c9c2371679d43311d9d6b069c988e94 /app/views | |
| parent | 50dc62ea3a36039463032aa2e712471859d9d9b6 (diff) | |
| parent | 48d00ac0d9ad703fa3605337b0866c8ce6f21b28 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 3 | ||||
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 6510e0560..c666bafb5 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -34,6 +34,9 @@ .fields-group = f.input :setting_hide_network, as: :boolean, wrapper: :with_label + .fields-group + = f.input :setting_show_application, as: :boolean, wrapper: :with_label + - unless Setting.hide_followers_count .fields-group = f.input :setting_hide_followers_count, as: :boolean, wrapper: :with_label 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 |