be smarter about host setting
This commit is contained in:
parent
b8d700ea65
commit
2b6f2ceabe
|
@ -3,13 +3,12 @@ require 'travis/api/app'
|
||||||
class Travis::Api::App
|
class Travis::Api::App
|
||||||
class Endpoint
|
class Endpoint
|
||||||
class Home < Endpoint
|
class Home < Endpoint
|
||||||
unless Travis.config.client_domain or test?
|
host = Travis.config.client_domain || Travis.config.host
|
||||||
fail "Travis.config.client_domain is not set"
|
fail "Travis.config.client_domain is not set" unless host or test?
|
||||||
end
|
|
||||||
|
|
||||||
set :prefix, '/'
|
set :prefix, '/'
|
||||||
set :client_config,
|
set :client_config,
|
||||||
host: Travis.config.client_domain,
|
host: host,
|
||||||
shorten_host: Travis.config.shorten_host,
|
shorten_host: Travis.config.shorten_host,
|
||||||
assets: Travis.config.assets,
|
assets: Travis.config.assets,
|
||||||
pusher: (Travis.config.pusher || {}).to_hash.slice(:host, :port, :scheme, :key),
|
pusher: (Travis.config.pusher || {}).to_hash.slice(:host, :port, :scheme, :key),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user