projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '20862-google-api-client'
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
collections_controller.rb
diff --git
a/apps/workbench/app/controllers/collections_controller.rb
b/apps/workbench/app/controllers/collections_controller.rb
index 9073d06c178c3edeb23bee3b3d16cfcafca5f4ff..680c324f5cd0255fb89f1ce6b2ed9333a0e7603a 100644
(file)
--- a/
apps/workbench/app/controllers/collections_controller.rb
+++ b/
apps/workbench/app/controllers/collections_controller.rb
@@
-376,7
+376,7
@@
class CollectionsController < ApplicationController
uri.path += 't=' + opts[:path_token] + '/'
end
uri.path += '_/'
- uri.path +=
URI.escape(file
) if file
+ uri.path +=
ERB::Util.url_encode(file).gsub('%2F', '/'
) if file
query = Hash[URI.decode_www_form(uri.query || '')]
{ query_token: 'api_token',