summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-06 08:29:18 +0000
committerDouwe Maan <douwe@gitlab.com>2015-08-06 08:29:18 +0000
commit863f61343a5a51b3b6a1c596353ecdfd6c20d523 (patch)
tree5151ab79f956ffc18cd21e55fcec11e764add69a /lib
parentce47dd4bb0c686aee13b309b07eb8f976aa5d547 (diff)
parentecbe119af13dfef707694fc7a271d60f3af8f779 (diff)
downloadgitlab-ce-863f61343a5a51b3b6a1c596353ecdfd6c20d523.tar.gz
Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'
Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084
Diffstat (limited to 'lib')
-rw-r--r--lib/extracts_path.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/extracts_path.rb b/lib/extracts_path.rb
index 3f420553d42..322aed5e27c 100644
--- a/lib/extracts_path.rb
+++ b/lib/extracts_path.rb
@@ -94,7 +94,7 @@ module ExtractsPath
@options = params.select {|key, value| allowed_options.include?(key) && !value.blank? }
@options = HashWithIndifferentAccess.new(@options)
- @id = get_id
+ @id = Addressable::URI.unescape(get_id)
@ref, @path = extract_ref(@id)
@repo = @project.repository
if @options[:extended_sha1].blank?