Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-07-04 12:35:39 +0300
committerPhil Hughes <me@iamphill.com>2018-07-05 17:44:56 +0300
commite241fe6b78768b084d7ca49ca1648eaad7b264ba (patch)
tree035e86499d0ac8c510356b8a896a24018fade45e /spec/requests/api/merge_requests_spec.rb
parent828b977214a539095c20e3363f72394c8ad978bf (diff)
added API docs
CHANGELOG improved comments in API code improved spec description
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
-rw-r--r--spec/requests/api/merge_requests_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index b58ca296301..1716d182782 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -306,7 +306,7 @@ describe API::MergeRequests do
expect(json_response['changes_count']).to eq(merge_request.merge_request_diff.real_size)
end
- it 'exposes description and title html' do
+ it 'exposes description and title html when render_html is true' do
get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), render_html: true
expect(response).to have_gitlab_http_status(200)