diff options
| author | Sean Edge <asedge@gmail.com> | 2014-05-06 17:28:21 -0400 |
|---|---|---|
| committer | Sean <asedge@gmail.com> | 2014-05-08 07:06:47 -0400 |
| commit | da9b009d31ee342d96da7b8796b937849de650cd (patch) | |
| tree | b3938425afffcd5d3195aa1760eb3693d32abae5 /lib | |
| parent | 536b2f2f75d384446e4d3d103903a6ff909bd4da (diff) | |
| download | gitlab-ce-da9b009d31ee342d96da7b8796b937849de650cd.tar.gz | |
Add fix for API when branch names have periods in them. Relates to issue #6128 (https://github.com/gitlabhq/gitlabhq/issues/6128).
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/branches.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/api/branches.rb b/lib/api/branches.rb index 953c6100f8b..d54f9371fbe 100644 --- a/lib/api/branches.rb +++ b/lib/api/branches.rb @@ -24,7 +24,7 @@ module API # branch (required) - The name of the branch # Example Request: # GET /projects/:id/repository/branches/:branch - get ":id/repository/branches/:branch" do + get ':id/repository/branches/:branch', requirements: { branch: /.*/ } do @branch = user_project.repo.heads.find { |item| item.name == params[:branch] } not_found!("Branch does not exist") if @branch.nil? present @branch, with: Entities::RepoObject, project: user_project @@ -37,7 +37,9 @@ module API # branch (required) - The name of the branch # Example Request: # PUT /projects/:id/repository/branches/:branch/protect - put ":id/repository/branches/:branch/protect" do + put ':id/repository/branches/:branch/protect', + requirements: { branch: /.*/ } do + authorize_admin_project @branch = user_project.repository.find_branch(params[:branch]) @@ -55,7 +57,9 @@ module API # branch (required) - The name of the branch # Example Request: # PUT /projects/:id/repository/branches/:branch/unprotect - put ":id/repository/branches/:branch/unprotect" do + put ':id/repository/branches/:branch/unprotect', + requirements: { branch: /.*/ } do + authorize_admin_project @branch = user_project.repository.find_branch(params[:branch]) |