summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-09-22 02:16:13 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-09-22 02:16:13 -0700
commit0d23ea294db936c7c9e4879cda75907b749eee54 (patch)
tree4a1631a19d8fd6894b1e9de373ec89f9c751198a /lib/api
parent3d2ec9fe0040904214f765962dc325302d11aca0 (diff)
parentd426195df876ad6d76e6d79d3031e8da95fb532a (diff)
downloadgitlab-ce-0d23ea294db936c7c9e4879cda75907b749eee54.tar.gz
Merge pull request #5145 from hiroponz/fix-api-merge-request
Fix API::MergeRequest
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/merge_requests.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 4a521c3daeb..d690f1d07e7 100644
--- 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?