summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorVinnie Okada <vokada@mrvinn.com>2015-03-24 20:03:22 -0600
committerVinnie Okada <vokada@mrvinn.com>2015-03-24 20:03:22 -0600
commit057c8c344b6518cb50b81607e0f88734fc164a9e (patch)
tree996afee0c0f33bd6308f83b330a179dc29dfb48a /lib/api
parent637ca0b388382112850fd3052a961bb07db34d14 (diff)
parentb9372c999707558b695fa401b4f660a3d38fce86 (diff)
downloadgitlab-ce-057c8c344b6518cb50b81607e0f88734fc164a9e.tar.gz
Merge branch 'master' into markdown-tags
Diffstat (limited to 'lib/api')
-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
{