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:
authorDouwe Maan <douwe@gitlab.com>2018-06-18 11:29:41 +0300
committerDouwe Maan <douwe@gitlab.com>2018-06-18 11:29:41 +0300
commit4be23eeae376ede50905b741f88b089b1669b07f (patch)
tree9e1a4cbb1f43651728036247cdc6f6980add0c9a /spec/controllers
parent39208ed6750e31d10e4bad5a33693a83eb599f1f (diff)
parentc6420ce2ab18681d6a5b06621d89775e3cf81065 (diff)
Merge branch '47933-MR-invisible-milestone' into 'master'
Resolve "Milestone not updating in MR sidebar after selection" Closes #47933 See merge request gitlab-org/gitlab-ce!19870
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb2
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 22858de0475..a412e74581d 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -234,7 +234,7 @@ describe Projects::MergeRequestsController do
body = JSON.parse(response.body)
expect(body['assignee'].keys)
- .to match_array(%w(name username avatar_url))
+ .to match_array(%w(name username avatar_url id state web_url))
end
end