diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
| commit | 1b8fcd4df52c8d715f89180faea8205310f197ae (patch) | |
| tree | 705b8b59bafdd26cb96983e2da0104e8b7308ea7 /app/views/stream_entries/_simple_status.html.haml | |
| parent | ee00da01d2e4cc455b92f1f4a7c9142c73048433 (diff) | |
| parent | ecf06d7e821a4b8f4585f1b6f0e39c595ed047ce (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml
Diffstat (limited to 'app/views/stream_entries/_simple_status.html.haml')
| -rw-r--r-- | app/views/stream_entries/_simple_status.html.haml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index 03d416fd6..2ad1f5120 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -20,7 +20,6 @@ %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }< = Formatter.instance.format(status, custom_emojify: true) - - unless status.media_attachments.empty? - if status.media_attachments.first.video? - video = status.media_attachments.first |