diff options
| author | bikebilly <fabio@gitlab.com> | 2017-11-07 09:44:13 +0100 |
|---|---|---|
| committer | bikebilly <fabio@gitlab.com> | 2017-11-07 09:44:13 +0100 |
| commit | a40bb17688f4d2983c22929cfbb1d888c2a6e68c (patch) | |
| tree | 90d8c6d008affa2b774b6f2a958355a419283285 /spec/lib/banzai/commit_renderer_spec.rb | |
| parent | ad9c0bae5f573fb14410d421247814673ea9e690 (diff) | |
| parent | e99ddb6f374c9f79c1c78e808c5e9bd983bed227 (diff) | |
| download | gitlab-ce-a40bb17688f4d2983c22929cfbb1d888c2a6e68c.tar.gz | |
Resolve conflicts
Diffstat (limited to 'spec/lib/banzai/commit_renderer_spec.rb')
| -rw-r--r-- | spec/lib/banzai/commit_renderer_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/banzai/commit_renderer_spec.rb b/spec/lib/banzai/commit_renderer_spec.rb index 049d025a5b9..84adaebdcbe 100644 --- a/spec/lib/banzai/commit_renderer_spec.rb +++ b/spec/lib/banzai/commit_renderer_spec.rb @@ -10,7 +10,7 @@ describe Banzai::CommitRenderer do described_class::ATTRIBUTES.each do |attr| expect_any_instance_of(Banzai::ObjectRenderer).to receive(:render).with([project.commit], attr).once.and_call_original - expect(Banzai::Renderer).to receive(:cacheless_render_field).with(project.commit, attr) + expect(Banzai::Renderer).to receive(:cacheless_render_field).with(project.commit, attr, {}) end described_class.render([project.commit], project, user) |