about summary refs log tree commit diff
path: root/spec/views
diff options
context:
space:
mode:
authorEffy Elden <github@effy.is>2017-04-17 01:41:33 +1000
committerGitHub <noreply@github.com>2017-04-17 01:41:33 +1000
commitacd33101c50ba0cf09c1c41616f919d37760f3f7 (patch)
tree43564c181a7f58ce7471026bd0daa099344330e8 /spec/views
parentfd81916e8625e5de39855522300eaeffd85ee13d (diff)
parent99226aba9391535a20d3cc6dba0f45e5792c73d4 (diff)
Merge branch 'master' into fix/cache_blocking
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