suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow to overwrite github's oauth access settings url with ENV

Browse Source
This commit is contained in:
Piotr Sarnacki 2015-04-09 11:03:46 +02:00
parent e33f38a159
commit 2deb352f96
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/environment.js
View File

@ -31,7 +31,7 @@ module.exports = function(environment) {
endpoints: {}, endpoints: {},
intervals: { updateTimes: 1000 }, intervals: { updateTimes: 1000 },
statusPageStatusUrl: 'https://pnpcptp8xh9k.statuspage.io/api/v2/status.json', statusPageStatusUrl: 'https://pnpcptp8xh9k.statuspage.io/api/v2/status.json',
githubOrgsOauthAccessSettingsUrl: 'https://github.com/settings/connections/4753903' githubOrgsOauthAccessSettingsUrl: 'https://github.com/settings/connections/applications/f244293c729d5066cf27'
}; };
if (typeof process !== 'undefined') { if (typeof process !== 'undefined') {
@ -58,7 +58,6 @@ module.exports = function(environment) {
security: ENV.billingEndpoint + "/pages/security", security: ENV.billingEndpoint + "/pages/security",
terms: ENV.billingEndpoint + "/pages/terms" terms: ENV.billingEndpoint + "/pages/terms"
}; };
ENV.githubOrgsOauthAccessSettingsUrl = 'https://github.com/settings/connections/4753903'
} }
} }

3
waiter/config.ru
View File

@ -70,5 +70,6 @@ run Travis::Web::App.build(
enterprise: ENV['TRAVIS_ENTERPRISE'], enterprise: ENV['TRAVIS_ENTERPRISE'],
code_climate: ENV['CODE_CLIMATE'], code_climate: ENV['CODE_CLIMATE'],
code_climate_url: ENV['CODE_CLIMATE_URL'], code_climate_url: ENV['CODE_CLIMATE_URL'],
assets_host: ENV['ASSETS_HOST'] assets_host: ENV['ASSETS_HOST'],
github_orgs_oauth_access_settings_url: ENV['GITHUB_ORGS_OAUTH_ACCESS_SETTINGS_URL']
) )

1
waiter/lib/travis/web/app.rb
View File

@ -198,6 +198,7 @@ class Travis::Web::App
config['codeClimate'] = options[:code_climate] if options[:code_climate] config['codeClimate'] = options[:code_climate] if options[:code_climate]
config['codeClimateUrl'] = options[:code_climate_url] if options[:code_climate_url] config['codeClimateUrl'] = options[:code_climate_url] if options[:code_climate_url]
config['charmKey'] = options[:charm_key] if options[:charm_key] config['charmKey'] = options[:charm_key] if options[:charm_key]
config['githubOrgsOauthAccessSettingsUrl'] = options[:github_orgs_oauth_access_settings_url]
config['endpoints'] = { config['endpoints'] = {
'sshKey' => options[:ssh_key_enabled], 'sshKey' => options[:ssh_key_enabled],