kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix protected branches API to accept name parameter with dot

This commit is contained in:
Mark Fletcher 2018-01-19 20:07:44 +00:00
parent ee58763158
commit 5a160b05ed
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/42231-protected-branches-api-route-returns-404-for-branches-with-dots.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix protected branches API to accept name parameter with dot
merge_request:
author:
type: fixed

2
lib/api/protected_branches.rb
View File

@ -2,7 +2,7 @@ module API
class ProtectedBranches < Grape::API
include PaginationParams
BRANCH_ENDPOINT_REQUIREMENTS = API::PROJECT_ENDPOINT_REQUIREMENTS.merge(branch: API::NO_SLASH_URL_PART_REGEX)
BRANCH_ENDPOINT_REQUIREMENTS = API::PROJECT_ENDPOINT_REQUIREMENTS.merge(name: API::NO_SLASH_URL_PART_REGEX)
before { authorize_admin_project }

6
spec/requests/api/protected_branches_spec.rb
View File

@ -80,6 +80,12 @@ describe API::ProtectedBranches do
it_behaves_like 'protected branch'
end
context 'when protected branch contains a period' do
let(:protected_name) { 'my.feature' }
it_behaves_like 'protected branch'
end
end
context 'when authenticated as a guest' do