diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-03-07 14:51:56 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-03-07 14:51:56 +0100 |
| commit | 3374027e3a4e4eb040e59294a9ced9d7886a71e2 (patch) | |
| tree | 4587984396a32047a6337e7810a39633ba683545 /lib/api/merge_requests.rb | |
| parent | 39114d259c6e4bd5bb60b18f561d06cc24e8c852 (diff) | |
| parent | 9c2a6e201388e7e30987a8679ddfa65b9422a38c (diff) | |
| download | gitlab-ce-3374027e3a4e4eb040e59294a9ced9d7886a71e2.tar.gz | |
Merge branch 'master' into fixes/api, code clean up and tests fixed
Conflicts:
doc/api/projects.md
spec/requests/api/projects_spec.rb
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 5adf57b36c5..234a005a998 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -8,6 +8,8 @@ module Gitlab def handle_merge_request_errors!(errors) if errors[:project_access].any? error!(errors[:project_access], 422) + elsif errors[:branch_conflict].any? + error!(errors[:branch_conflict], 422) end not_found! end |