From: Effy Elden Date: Sat, 14 Jan 2017 22:12:11 +0000 (+1100) Subject: Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature... X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f81dc7a33ae975b640089e474b01c2081119f372;p=mastodon.git Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source --- f81dc7a33ae975b640089e474b01c2081119f372 diff --cc app/views/stream_entries/_detailed_status.html.haml index a89503cff,a751abf3c..946adbd8e --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@@ -28,10 -28,9 +28,10 @@@ = link_to TagManager.instance.url_for(status), class: 'detailed-status__datetime u-url u-uid', target: @external_links ? '_blank' : nil, rel: 'noopener' do %span= l(status.created_at) · - = link_to status.application.website, class: 'detailed-status__application', target: @external_links ? '_blank' : nil, rel: 'noopener' do - %span= status.application.name - · + - if status.application - = link_to status.application.website, class: 'detailed-status__application', target: @external_links ? '_blank' : nil, rel: 'noooper' do ++ = link_to status.application.website, class: 'detailed-status__application', target: @external_links ? '_blank' : nil, rel: 'noopener' do + %span= status.application.name + · %span = fa_icon('retweet') %span= status.reblogs.count