From 08dbac84aa627d923f9066e97fd02269c71c9ff9 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 15 Jul 2015 14:26:41 +0200 Subject: [PATCH] add userlike config option --- app/app.coffee | 4 +++- config/environment.js | 2 +- waiter/config.ru | 1 + waiter/lib/travis/web/app.rb | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/app.coffee b/app/app.coffee index dde5b842..8aa55baa 100644 --- a/app/app.coffee +++ b/app/app.coffee @@ -59,7 +59,8 @@ App = Ember.Application.extend(Ember.Evented, Travis.onUserUpdate(user) @on 'user:signed_out', () -> - Travis.removeUserlike() + if config.userlike + Travis.removeUserlike() currentDate: -> new Date() @@ -67,6 +68,7 @@ App = Ember.Application.extend(Ember.Evented, onUserUpdate: (user) -> if config.pro @identifyCustomer(user) + if config.userlike @setupUserlike(user) @subscribePusher(user) diff --git a/config/environment.js b/config/environment.js index abf706be..2d4caf97 100644 --- a/config/environment.js +++ b/config/environment.js @@ -52,7 +52,7 @@ module.exports = function(environment) { sshKey: true, caches: true }; - ENV.charmKey = 'gy5gx7dy6dh86hxzkz1wmtvupwvievu'; + ENV.userlike = true; ENV.urls = { legal: ENV.billingEndpoint + "/pages/legal", imprint: ENV.billingEndpoint + "/pages/imprint", diff --git a/waiter/config.ru b/waiter/config.ru index 9aaaf25b..fdca382c 100644 --- a/waiter/config.ru +++ b/waiter/config.ru @@ -50,6 +50,7 @@ if ENV['TRAVIS_ENTERPRISE'] end run Travis::Web::App.build( + userlike: ENV['USERLIKE'], environment: ENV['RACK_ENV'] || 'development', api_endpoint: ENV['API_ENDPOINT'], pages_endpoint: ENV['PAGES_ENDPOINT'], diff --git a/waiter/lib/travis/web/app.rb b/waiter/lib/travis/web/app.rb index 46c1fb4c..92614286 100644 --- a/waiter/lib/travis/web/app.rb +++ b/waiter/lib/travis/web/app.rb @@ -200,6 +200,7 @@ class Travis::Web::App config['charmKey'] = options[:charm_key] if options[:charm_key] config['githubOrgsOauthAccessSettingsUrl'] = options[:github_orgs_oauth_access_settings_url] config['ajaxPolling'] = true if options[:ajax_polling] + config['userlike'] = true if options[:userlike] config['endpoints'] = { 'sshKey' => options[:ssh_key_enabled],