about summary refs log tree commit diff
path: root/spec/views
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-16 12:51:30 +0200
committerGitHub <noreply@github.com>2017-04-16 12:51:30 +0200
commit5d710b1139b34f2ed6bd556f448fa7248354e758 (patch)
tree958a5ff315699f13b4668f190c321291df06e29c /spec/views
parent8a58942c80275788cbe069f2d67c396732ec092d (diff)
Make file attachment on MediaAttachment optional (#1865)
Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true
Clean up old media files when creating a new domain block with reject_media set to true
Return remote_url in media attachments API if local file is not present
Undo domain block action in admin UI
Ability to enable reject_media from admin UI
Diffstat (limited to 'spec/views')
-rw-r--r--spec/views/stream_entries/show.html.haml_spec.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/views/stream_entries/show.html.haml_spec.rb b/spec/views/stream_entries/show.html.haml_spec.rb
index 5526d6780..acc0c39f5 100644
--- a/spec/views/stream_entries/show.html.haml_spec.rb
+++ b/spec/views/stream_entries/show.html.haml_spec.rb
@@ -61,5 +61,4 @@ describe 'stream_entries/show.html.haml' do
     expect(mf2.entry.in_reply_to.format.author.format.name.to_s).to eq alice.display_name
     expect(mf2.entry.in_reply_to.format.author.format.url.to_s).not_to be_empty
   end
-
 end