summaryrefslogtreecommitdiff
path: root/lib/api/projects.rb
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-09-01 16:34:31 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-09-01 16:34:31 +0100
commit054b3a500c1eb9f3b2a24f056688934ac30a1caa (patch)
tree1abeac650ad396f854aa97c4da0f275e50772180 /lib/api/projects.rb
parent4d313c3b2e3824422d24860a082daab57ba5bcb6 (diff)
parentad32bac56de11aa75a41f4e88f28632c5ca0ff70 (diff)
downloadgitlab-ce-054b3a500c1eb9f3b2a24f056688934ac30a1caa.tar.gz
Merge branch 'master' into vue-docs
* master: (215 commits) Simplify Git interactions in AfterImportService Remove some empty lines from notify specs Validate unescaped `%` chars in PO files Optimize notification emails specs Fixed group merge requests failure Rollsback changes made to signing_enabled. Changed title on 404 page Changed message and title on the 404 page Make Gitaly PostUploadPack mandatory Use gitaly 0.36.0 Instrument MergeRequest#fetch_ref /move project functionality. Squash commit. Remove closing external issues by reference error Fetch all translation keys using a regex Take `nplurals` into account when validating translations. Check for newlines in different methods on TranslationEntry Split translation & metadata entries into classes Validate the number of plurals in an entry Move detailed information of an entry into a separate class Move `PoLinter` into `Gitlab::I18n` ...
Diffstat (limited to 'lib/api/projects.rb')
-rw-r--r--lib/api/projects.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 78d900984ac..4845242a173 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -95,7 +95,7 @@ module API
end
end
- resource :users, requirements: { user_id: %r{[^/]+} } do
+ resource :users, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do
desc 'Get a user projects' do
success Entities::BasicProjectDetails
end
@@ -183,7 +183,7 @@ module API
params do
requires :id, type: String, desc: 'The ID of a project'
end
- resource :projects, requirements: { id: %r{[^/]+} } do
+ resource :projects, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do
desc 'Get a single project' do
success Entities::ProjectWithAccess
end