diff options
| author | mhasbini <mohammad.hasbini@gmail.com> | 2017-04-27 01:04:07 +0300 |
|---|---|---|
| committer | mhasbini <mohammad.hasbini@gmail.com> | 2017-04-27 01:04:07 +0300 |
| commit | ccac05dd90cb5cfa9abbeb11a50f953541eb83bb (patch) | |
| tree | ff721d7fddfa595a75b3e2594ab7b5af7590d47f /lib | |
| parent | 43fb9279ce39d51b1deceb5108560bf37b8d340d (diff) | |
| download | gitlab-ce-ccac05dd90cb5cfa9abbeb11a50f953541eb83bb.tar.gz | |
Fix 404 when upstream has disabled merge requests
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) |