diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-18 18:04:49 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-18 18:04:49 +0200 |
| commit | bfeac6747a58b660f0d1b3766c7cfb3ea2655fce (patch) | |
| tree | e9d1366c30b94df21ec767276fbde175428399fb /app/views/stream_entries/_status.html.haml | |
| parent | 7423c0c1308555db3072ae64141250fdd33ce235 (diff) | |
| parent | 298ee84488758fc08a0ae9233e04c9637aa2fe02 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.
Diffstat (limited to 'app/views/stream_entries/_status.html.haml')
| -rw-r--r-- | app/views/stream_entries/_status.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index 320c9bc4f..92003a48f 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -53,3 +53,9 @@ - if @next_descendant_thread .entry{ class: entry_classes } = link_to_more short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1) + +- if include_threads && !embedded_view? && !user_signed_in? + .entry{ class: entry_classes } + = link_to new_user_session_path, class: 'load-more load-gap' do + = fa_icon 'comments' + = t('statuses.sign_in_to_participate') |