summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-24 16:27:51 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-24 16:27:51 -0700
commit64408fce3815f13b1ee1e457178a34d9af976eba (patch)
tree024f078a20aea97df28d1c7b44aa5a0195fb3977
parent0d50a65b320ac709e82f8b57d543a76638339d07 (diff)
parenteb2ce79d2e1d0e4e16052d630468925a6c87f725 (diff)
downloadgitlab-ce-64408fce3815f13b1ee1e457178a34d9af976eba.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--lib/api/branches.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/branches.rb b/lib/api/branches.rb
index b52d786e020..edfdf842f85 100644
--- a/lib/api/branches.rb
+++ b/lib/api/branches.rb
@@ -1,4 +1,5 @@
require 'mime/types'
+require 'uri'
module API
# Projects API
@@ -103,7 +104,7 @@ module API
delete ":id/repository/branches/:branch" do
authorize_push_project
result = DeleteBranchService.new(user_project, current_user).
- execute(params[:branch])
+ execute(URI.unescape(params[:branch]))
if result[:status] == :success
{