diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2019-04-05 07:29:53 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-04-05 07:29:53 +0000 |
| commit | 59ac0924da8ffc6ae28eecffda2654cd7ab8f761 (patch) | |
| tree | dd2740b77f9af61df459945e60bbd27c0b155140 /lib/api | |
| parent | ff648879642f81ccb5eda7c70b9738916a185630 (diff) | |
| download | gitlab-ce-59ac0924da8ffc6ae28eecffda2654cd7ab8f761.tar.gz | |
Fix IDE detecting MR from fork branch
**Why?**
Currently the IDE loads a merge request based on only the
`source_branch` name. This means it loads MR's from
forks that have the same branch name (not good).
- This required updating the BE API to accept `source_project_id`
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/merge_requests.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 98dcc388f44..e4b21b7d1c4 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -111,6 +111,7 @@ module API desc: 'Return merge requests for the given scope: `created_by_me`, `assigned_to_me` or `all`' optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji' optional :source_branch, type: String, desc: 'Return merge requests with the given source branch' + optional :source_project_id, type: Integer, desc: 'Return merge requests with the given source project id' optional :target_branch, type: String, desc: 'Return merge requests with the given target branch' optional :search, type: String, desc: 'Search merge requests for text present in the title, description, or any combination of these' optional :in, type: String, desc: '`title`, `description`, or a string joining them with comma' |