diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-03-31 19:03:54 -0700 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-03-31 19:03:54 -0700 |
| commit | d77f333f9c7968337241904918d97f67dd5bae82 (patch) | |
| tree | e8c75a351267111d7528115f2217caaaff138f7d /lib/api | |
| parent | 96d093e59aa9c952c4c85908a664a62a1f2057d4 (diff) | |
| parent | c14c03a88f6c9a1054cf0e7dc2067d47cae6710a (diff) | |
| download | gitlab-ce-d77f333f9c7968337241904918d97f67dd5bae82.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Conflicts:
lib/gitlab/markdown.rb
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/branches.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/branches.rb b/lib/api/branches.rb index edfdf842f85..592100a7045 100644 --- a/lib/api/branches.rb +++ b/lib/api/branches.rb @@ -1,5 +1,4 @@ require 'mime/types' -require 'uri' module API # Projects API @@ -101,10 +100,11 @@ module API # branch (required) - The name of the branch # Example Request: # DELETE /projects/:id/repository/branches/:branch - delete ":id/repository/branches/:branch" do + delete ":id/repository/branches/:branch", + requirements: { branch: /.*/ } do authorize_push_project result = DeleteBranchService.new(user_project, current_user). - execute(URI.unescape(params[:branch])) + execute(params[:branch]) if result[:status] == :success { |