diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-02 11:14:41 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-02 11:14:41 +0000 |
| commit | 3efe534255a130f41d1427efd35ea84e39a99297 (patch) | |
| tree | 0369fa3167b9c592069e8bf73505836d8e8ed6f9 /lib | |
| parent | 59175a576723c2a105180c1e526d4bd2f597c377 (diff) | |
| parent | ccac05dd90cb5cfa9abbeb11a50f953541eb83bb (diff) | |
| download | gitlab-ce-3efe534255a130f41d1427efd35ea84e39a99297.tar.gz | |
Merge branch '26488-target-disabled-mr' into 'master'
Fix 404 when upstream disabled merge requests
Closes #26488
See merge request !10427
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/merge_requests.rb | 2 | ||||
| -rw-r--r-- | lib/api/v3/merge_requests.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index e5793fbc5cb..710deba5ae3 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -20,6 +20,8 @@ module API error!(errors[:validate_fork], 422) elsif errors[:validate_branches].any? conflict!(errors[:validate_branches]) + elsif errors[:base].any? + error!(errors[:base], 422) end render_api_error!(errors, 400) diff --git a/lib/api/v3/merge_requests.rb b/lib/api/v3/merge_requests.rb index 3077240e650..1616142a619 100644 --- a/lib/api/v3/merge_requests.rb +++ b/lib/api/v3/merge_requests.rb @@ -23,6 +23,8 @@ module API error!(errors[:validate_fork], 422) elsif errors[:validate_branches].any? conflict!(errors[:validate_branches]) + elsif errors[:base].any? + error!(errors[:base], 422) end render_api_error!(errors, 400) |