Merge branch 'master' into fixes/api, code clean up and tests fixed

Conflicts: doc/api/projects.md spec/requests/api/projects_spec.rb
2013-03-07 14:51:56 +01:00 · 2013-03-07 14:51:56 +01:00 · 3374027e3a
commit 3374027e3a
parent 39114d259c 9c2a6e2013
49 changed files with 820 additions and 163 deletions
--- 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