diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-12 03:30:57 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-12 03:30:57 -0500 |
| commit | a817f084eafaf5527445c29ab1d68f42b1a2872f (patch) | |
| tree | f146e6c8ff958d60804e33e40e1970784f5b7b90 /spec/views | |
| parent | eb72c3398cd70c6b595fae5a0cb6730a3e49bd61 (diff) | |
| parent | 8e88a18316d45a459a31d67487bccc247592d187 (diff) | |
Merge remote-tracking branch 'tootsuite/master'
Conflicts: app/controllers/statuses_controller.rb
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/stream_entries/show.html.haml_spec.rb | 2 |
1 files changed, 1 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 59ea40990..6074bbc2e 100644 --- a/spec/views/stream_entries/show.html.haml_spec.rb +++ b/spec/views/stream_entries/show.html.haml_spec.rb @@ -48,7 +48,7 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d assign(:stream_entry, reply.stream_entry) assign(:account, alice) assign(:type, reply.stream_entry.activity_type.downcase) - assign(:ancestors, reply.stream_entry.activity.ancestors(bob) ) + assign(:ancestors, reply.stream_entry.activity.ancestors(1, bob) ) assign(:descendants, reply.stream_entry.activity.descendants(bob)) render |