diff options
author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-03-29 23:55:03 -0300 |
---|---|---|
committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-03-30 00:02:32 -0300 |
commit | 808bcf5bc616af4d57011df1e37675069319e7c5 (patch) | |
tree | d6f4d66aa69268b8e92b45f5ce89f34ac071090e /spec/controllers | |
parent | 11865ee267894f340a9d3f46cd6e64b671ad96e4 (diff) | |
download | gitlab-ce-808bcf5bc616af4d57011df1e37675069319e7c5.tar.gz |
Fixed MergeRequestController specpatch/fix-mergerequest-diff
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index c5b034dc064..75e6b6f45a7 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -63,7 +63,7 @@ describe Projects::MergeRequestsController do id: merge_request.iid, format: format) - expect(response.body).to eq((merge_request.send(:"to_#{format}",user)).to_s) + expect(response.body).to eq((merge_request.send(:"to_#{format}")).to_s) end it "should not escape Html" do |