Fix API::MergeRequest

Fixes #5144 Refs #4996

Fix API::MergeRequest
d426195d · Hiroyuki Sato · 5367e42b · d426195d · d426195d
Commit d426195d authored Sep 22, 2013 by Hiroyuki Sato
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 27 additions and 27 deletions

merge_requests.rb lib/api/merge_requests.rb +1 -1

merge_requests_spec.rb spec/requests/api/merge_requests_spec.rb +26 -26

No files found.
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -4,7 +4,7 @@ module API
    before { authenticate! }
    before { Thread.current[:current_user] = current_user }

-    resource :projects, requirements: { id: /[a-zA-Z.0-9_\-]+\/[a-zA-Z.0-9_\-]+/ } do
+    resource :projects do
      helpers do
        def handle_merge_request_errors!(errors)
          if errors[:project_access].any?

--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb