X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/16f704326f44fd1e5e5e60b936c9b5895d6a6ff8..b5c15775caf865d8fed5d4839d4a082f6518bba4:/services/api/app/controllers/static_controller.rb?ds=sidebyside diff --git a/services/api/app/controllers/static_controller.rb b/services/api/app/controllers/static_controller.rb index f0992c1831..b7693f3420 100644 --- a/services/api/app/controllers/static_controller.rb +++ b/services/api/app/controllers/static_controller.rb @@ -5,15 +5,15 @@ class StaticController < ApplicationController respond_to :json, :html - skip_before_filter :find_object_by_uuid - skip_before_filter :render_404_if_no_object - skip_before_filter :require_auth_scope, only: [:home, :empty, :login_failure] + skip_before_action :find_object_by_uuid + skip_before_action :render_404_if_no_object + skip_before_action :require_auth_scope, only: [:home, :empty, :login_failure] def home respond_to do |f| f.html do - if Rails.configuration.workbench_address - redirect_to Rails.configuration.workbench_address + if !Rails.configuration.Services.Workbench1.ExternalURL.to_s.empty? + redirect_to Rails.configuration.Services.Workbench1.ExternalURL.to_s, allow_other_host: true else render_not_found "Oops, this is an API endpoint. You probably want to point your browser to an Arvados Workbench site instead." end @@ -25,7 +25,7 @@ class StaticController < ApplicationController end def empty - render text: "" + render plain: "" end end