Merge branch 'master' of github.com:gitlabhq/gitlabhq

64408fce · Dmitriy Zaporozhets · 0d50a65b · eb2ce79d · 64408fce
Commit 64408fce authored Mar 24, 2015 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

lib/api/branches.rb lib/api/branches.rb +2 -1

No files found.
--- a/lib/api/branches.rb
+++ b/lib/api/branches.rb
 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
          {