diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-22 11:45:36 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-22 11:45:36 +0300 |
| commit | bd5bb6ee9172206f4ba08ccf5fdf419544419d2d (patch) | |
| tree | a82b8b005650fb35dbc7a46112798e9981a963f1 /lib | |
| parent | 8bea2a70aca919a822eb539f0e96bd592a7c4cbf (diff) | |
| parent | 5a160b05eda88728543a0a74a174fa5883877171 (diff) | |
Merge branch '42231-protected-branches-api-route-returns-404-for-branches-with-dots' into 'master'
Resolve "Protected branches API route returns 404 for branches with dots"
Closes #42231
See merge request gitlab-org/gitlab-ce!16591
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/protected_branches.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/protected_branches.rb b/lib/api/protected_branches.rb index 614822509f0..c15c487deb4 100644 --- a/lib/api/protected_branches.rb +++ b/lib/api/protected_branches.rb @@ -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 } |