projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
2809: Merge branch '2809-workbench-rails4' refs #2809
[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 4178e38361b7481903df9743535d6a2c23818b90..7ef85a5cfc89dbc62c26e90cd41cd7ecd1a137c4 100644
(file)
--- a/
apps/workbench/app/controllers/collections_controller.rb
+++ b/
apps/workbench/app/controllers/collections_controller.rb
@@
-233,7
+233,7
@@
class CollectionsController < ApplicationController
env = Hash[ENV].
merge({
'ARVADOS_API_HOST' =>
-
$
arvados_api_client.arvados_v1_base.
+ arvados_api_client.arvados_v1_base.
sub(/\/arvados\/v1/, '').
sub(/^https?:\/\//, ''),
'ARVADOS_API_TOKEN' =>