Merge branch 'ember-cli' of github.com:travis-ci/travis-web into ember-cli

app/initializers/charm.coffee

@@ -0,0 +1,16 @@
+`import config from 'travis/config/environment'`
+
+initialize = (container, app) ->
+  if config.charmKey
+    window.__CHARM =
+      key: config.charmKey
+      url: "https://charmscout.herokuapp.com/feedback"
+
+    $('head').append $('<script src="https://charmscout.herokuapp.com/charmeur.js?v=2" async defer></script>')
+
+Initializer =
+  name: 'charm'
+  initialize: initialize
+
+`export {initialize}`
+`export default Initializer`

waiter/lib/travis/web/app.rb

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