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 | |
| parent | 11865ee267894f340a9d3f46cd6e64b671ad96e4 (diff) | |
| download | gitlab-ce-patch/fix-mergerequest-diff.tar.gz | |
Fixed MergeRequestController specpatch/fix-mergerequest-diff
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2cd06d90257..fba06241809 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,8 +5,9 @@ v 8.7.0 (unreleased) - Preserve time notes/comments have been updated at when moving issue - Make HTTP(s) label consistent on clone bar (Stan Hu) - Expose label description in API (Mariusz Jachimowicz) - - Allow back dating on issues when created through the API + - Allow back dating on issues when created through the API - Fix avatar stretching by providing a cropping feature + - Fix raw/rendered diff producing different results on merge requests !3450 - Add links to CI setup documentation from project settings and builds pages - Handle nil descriptions in Slack issue messages (Stan Hu) - Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.) 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 |