diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-02-27 10:23:36 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 08:27:51 +0100 |
| commit | f86928953d2d79f40f10813a6e244c1da0779d16 (patch) | |
| tree | 7396889bce42589175ec3c2fa314fdf621ef73b1 /spec/requests | |
| parent | 51253b2dd0bb073d271ddcbd172f7c204d4639db (diff) | |
| download | gitlab-ce-f86928953d2d79f40f10813a6e244c1da0779d16.tar.gz | |
Always require MR-iid for resolving discussions
And deduplicate the finding of MR's & discussions. Now the searching
is done in the service, istead of the controller & the API.
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/issues_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb index 4d52ab2aaa2..26997ac0107 100644 --- a/spec/requests/api/issues_spec.rb +++ b/spec/requests/api/issues_spec.rb @@ -951,6 +951,7 @@ describe API::Issues, api: true do before do post api("/projects/#{project.id}/issues", user), title: 'New Issue', + merge_request_for_resolving_discussions: merge_request.iid, discussion_to_resolve: discussion.id end |