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

add userlike config option

Browse Source
This commit is contained in:
Lisa Passing 2015-07-15 14:26:41 +02:00
parent a7bc36cba7
commit 08dbac84aa
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/app.coffee
View File

@ -59,6 +59,7 @@ App = Ember.Application.extend(Ember.Evented,
Travis.onUserUpdate(user) Travis.onUserUpdate(user)
@on 'user:signed_out', () -> @on 'user:signed_out', () ->
if config.userlike
Travis.removeUserlike() Travis.removeUserlike()
currentDate: -> currentDate: ->
@ -67,6 +68,7 @@ App = Ember.Application.extend(Ember.Evented,
onUserUpdate: (user) -> onUserUpdate: (user) ->
if config.pro if config.pro
@identifyCustomer(user) @identifyCustomer(user)
if config.userlike
@setupUserlike(user) @setupUserlike(user)
@subscribePusher(user) @subscribePusher(user)

2
config/environment.js
View File

@ -52,7 +52,7 @@ module.exports = function(environment) {
sshKey: true, sshKey: true,
caches: true caches: true
}; };
ENV.charmKey = 'gy5gx7dy6dh86hxzkz1wmtvupwvievu'; ENV.userlike = true;
ENV.urls = { ENV.urls = {
legal: ENV.billingEndpoint + "/pages/legal", legal: ENV.billingEndpoint + "/pages/legal",
imprint: ENV.billingEndpoint + "/pages/imprint", imprint: ENV.billingEndpoint + "/pages/imprint",

1
waiter/config.ru
View File

@ -50,6 +50,7 @@ if ENV['TRAVIS_ENTERPRISE']
end end
run Travis::Web::App.build( run Travis::Web::App.build(
userlike: ENV['USERLIKE'],
environment: ENV['RACK_ENV'] || 'development', environment: ENV['RACK_ENV'] || 'development',
api_endpoint: ENV['API_ENDPOINT'], api_endpoint: ENV['API_ENDPOINT'],
pages_endpoint: ENV['PAGES_ENDPOINT'], pages_endpoint: ENV['PAGES_ENDPOINT'],

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

@ -200,6 +200,7 @@ class Travis::Web::App
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['githubOrgsOauthAccessSettingsUrl'] = options[:github_orgs_oauth_access_settings_url]
config['ajaxPolling'] = true if options[:ajax_polling] config['ajaxPolling'] = true if options[:ajax_polling]
config['userlike'] = true if options[:userlike]
config['endpoints'] = { config['endpoints'] = {
'sshKey' => options[:ssh_key_enabled], 'sshKey' => options[:ssh_key_enabled],