diff --git a/assets/scripts/app/helpers/urls.coffee b/assets/scripts/app/helpers/urls.coffee index ab6f606f..cda9bbc5 100644 --- a/assets/scripts/app/helpers/urls.coffee +++ b/assets/scripts/app/helpers/urls.coffee @@ -3,22 +3,22 @@ "#{Travis.config.api_endpoint}/jobs/#{id}/log.txt?deansi=true" githubPullRequest: (slug, pullRequestNumber) -> - "https://github.com/#{slug}/pull/#{pullRequestNumber}" + "#{Travis.config.source_endpoint}/#{slug}/pull/#{pullRequestNumber}" githubCommit: (slug, sha) -> - "https://github.com/#{slug}/commit/#{sha}" + "#{Travis.config.source_endpoint}/#{slug}/commit/#{sha}" githubRepo: (slug) -> - "https://github.com/#{slug}" + "#{Travis.config.source_endpoint}/#{slug}" githubWatchers: (slug) -> - "https://github.com/#{slug}/watchers" + "#{Travis.config.source_endpoint}/#{slug}/watchers" githubNetwork: (slug) -> - "https://github.com/#{slug}/network" + "#{Travis.config.source_endpoint}/#{slug}/network" githubAdmin: (slug) -> - "https://github.com/#{slug}/settings/hooks#travis_minibucket" + "#{Travis.config.source_endpoint}/#{slug}/settings/hooks#travis_minibucket" statusImage: (slug, branch) -> "#{location.protocol}//#{location.host}/#{slug}.svg" + if branch then "?branch=#{encodeURIComponent(branch)}" else '' diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index f85a6efe..08835a6c 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -77,10 +77,11 @@ $.extend Travis, config: syncingPageRedirectionTime: 5000 - api_endpoint: $('meta[rel="travis.api_endpoint"]').attr('href') - pusher_key: $('meta[name="travis.pusher_key"]').attr('value') - pusher_host: $('meta[name="travis.pusher_host"]').attr('value') - ga_code: $('meta[name="travis.ga_code"]').attr('value') + api_endpoint: $('meta[rel="travis.api_endpoint"]').attr('href') + source_endpoint: $('meta[rel="travis.source_endpoint"]').attr('href') + pusher_key: $('meta[name="travis.pusher_key"]').attr('value') + pusher_host: $('meta[name="travis.pusher_host"]').attr('value') + ga_code: $('meta[name="travis.ga_code"]').attr('value') code_climate: $('meta[name="travis.code_climate"]').attr('value') ssh_key_enabled: $('meta[name="travis.ssh_key_enabled"]').attr('value') == 'true' code_climate_url: $('meta[name="travis.code_climate_url"]').attr('value') diff --git a/config.ru b/config.ru index 9eb6cec1..6d575869 100644 --- a/config.ru +++ b/config.ru @@ -26,13 +26,14 @@ use Travis::Web::ApiRedirect do |app| end run Travis::Web::App.build( - environment: ENV['RACK_ENV'] || 'development', - api_endpoint: ENV['API_ENDPOINT'], - pusher_key: ENV['PUSHER_KEY'], - pusher_host: ENV['PUSHER_HOST'] || 'ws.pusherapp.com', - ga_code: ENV['GA_CODE'], - root: File.expand_path('../public', __FILE__), - server_start: Time.now, - caches_enabled: ENV['CACHES_ENABLED'], + environment: ENV['RACK_ENV'] || 'development', + api_endpoint: ENV['API_ENDPOINT'], + source_endpoint: ENV['SOURCE_ENDPOINT'] || 'https://github.com', + pusher_key: ENV['PUSHER_KEY'], + pusher_host: ENV['PUSHER_HOST'] || 'ws.pusherapp.com', + ga_code: ENV['GA_CODE'], + root: File.expand_path('../public', __FILE__), + server_start: Time.now, + caches_enabled: ENV['CACHES_ENABLED'], ssh_key_enabled: ENV['SSH_KEY_ENABLED'] ) diff --git a/public/index.html b/public/index.html index 4d015f29..0d7eb6e9 100644 --- a/public/index.html +++ b/public/index.html @@ -4,6 +4,7 @@ +