diff options
author | Imre Farkas <ifarkas@gitlab.com> | 2018-11-08 13:18:17 +0100 |
---|---|---|
committer | Imre Farkas <ifarkas@gitlab.com> | 2018-11-28 12:54:11 +0100 |
commit | b1e070bf4957a558ac51315dd4a6277056047e8a (patch) | |
tree | 07f98719501b51e58f62762aaca80b7239d53231 /lib/api/protected_branches.rb | |
parent | 1cd570cf77b79f37f30ef3ccd399c337056aa236 (diff) | |
download | gitlab-ce-b1e070bf4957a558ac51315dd4a6277056047e8a.tar.gz |
Fix API::Namespaces to accept namepaces with dotsif-52811-fix_namespaces_api_routing
It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to
API::NAMESPACE_OR_PROJECT_REQUIREMENTS
Diffstat (limited to 'lib/api/protected_branches.rb')
-rw-r--r-- | lib/api/protected_branches.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/protected_branches.rb b/lib/api/protected_branches.rb index 47752f40e58..5af43448727 100644 --- a/lib/api/protected_branches.rb +++ b/lib/api/protected_branches.rb @@ -4,14 +4,14 @@ module API class ProtectedBranches < Grape::API include PaginationParams - BRANCH_ENDPOINT_REQUIREMENTS = API::PROJECT_ENDPOINT_REQUIREMENTS.merge(name: API::NO_SLASH_URL_PART_REGEX) + BRANCH_ENDPOINT_REQUIREMENTS = API::NAMESPACE_OR_PROJECT_REQUIREMENTS.merge(name: API::NO_SLASH_URL_PART_REGEX) before { authorize_admin_project } params do requires :id, type: String, desc: 'The ID of a project' end - resource :projects, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do + resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do desc "Get a project's protected branches" do success Entities::ProtectedBranch end |