From bb48a0faea00473c24e77e9e7464392f9de2c4fb Mon Sep 17 00:00:00 2001 From: winniehell Date: Thu, 18 Aug 2016 22:48:25 +0200 Subject: Do not escape URI when extracting path (!5878) --- lib/extracts_path.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'lib/extracts_path.rb') diff --git a/lib/extracts_path.rb b/lib/extracts_path.rb index 84688f6646e..a293fa2752f 100644 --- a/lib/extracts_path.rb +++ b/lib/extracts_path.rb @@ -94,7 +94,9 @@ module ExtractsPath @options = params.select {|key, value| allowed_options.include?(key) && !value.blank? } @options = HashWithIndifferentAccess.new(@options) - @id = Addressable::URI.normalize_component(get_id) + @id = params[:id] || params[:ref] + @id += "/" + params[:path] unless params[:path].blank? + @ref, @path = extract_ref(@id) @repo = @project.repository if @options[:extended_sha1].blank? @@ -116,12 +118,4 @@ module ExtractsPath def tree @tree ||= @repo.tree(@commit.id, @path) end - - private - - def get_id - id = params[:id] || params[:ref] - id += "/" + params[:path] unless params[:path].blank? - id - end end -- cgit v1.2.3