summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-09-14 07:47:41 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-09-14 07:47:41 -0700
commit2898d923971e9e81452285be8d61c0643b3b8bbd (patch)
treeb03df06c20cb10797c58bb74ffc9956f3cb3f28e /lib
parentdf92d4ff6796c2c8d85cdf9fe29ab496eb97c30a (diff)
parent553841ecedd7aa2122278b3c1c547b23392074c3 (diff)
downloadgitlab-ce-2898d923971e9e81452285be8d61c0643b3b8bbd.tar.gz
Merge pull request #4996 from hiroponz/drop-support-of-root-namespace
[WIP]Drop support of root namespace in routing
Diffstat (limited to 'lib')
-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 d690f1d07e7..4a521c3daeb 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 do
+ resource :projects, requirements: { id: /[a-zA-Z.0-9_\-]+\/[a-zA-Z.0-9_\-]+/ } do
helpers do
def handle_merge_request_errors!(errors)
if errors[:project_access].any?