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

app/routes/ssh-key.coffee

@@ -6,7 +6,7 @@ Route = TravisRoute.extend
   model: (params) ->
     repo = @modelFor('repo')
     self = this
-    SshKey.fetch(repo.get('id')).then ( (result) -> result unless result.get('isNew') ), (xhr) ->
+    @store.find('sshKey', repo.get('id')).then ( (result) -> result unless result.get('isNew') ), (xhr) ->
       if xhr.status == 404
         # if there is no model, just return null. I'm not sure if this is the
         # best answer, maybe we should just redirect to different route, like

app/templates/repos/show/tools.hbs

@@ -10,7 +10,7 @@
     <li>
       {{#link-to "requests" view.repo}}Requests{{/link-to}}
     </li>
-    {{#if config.caches_enabled}}
+    {{#if config.endpoints.caches}}
       <li>
         {{#link-to "caches" view.repo}}Caches{{/link-to}}
       </li>

app/templates/settings.hbs

@@ -1,7 +1,8 @@
 <ul class="navigation">
   <li>{{#link-to "settings.index"}}General Settings{{/link-to}}</li>
   <li>{{#link-to "env_vars"}}Environment Variables{{/link-to}}</li>
-  {{#if config.ssh_key_enabled}}
+
+  {{#if config.endpoints.sshKey}}
     <li>{{#link-to "ssh_key"}}SSH Key{{/link-to}}</li>
   {{/if}}
 </ul>

app/utils/pusher.coffee

@@ -1,4 +1,5 @@
 `import ENV from 'travis/config/environment'`
+`import Ajax from 'travis/utils/ajax'`
 
 TravisPusher = (config) ->
   @init(config)
@@ -117,7 +118,7 @@ if ENV.pro
 
     unless channels.fetching
       channels.fetching = true
-      Travis.ajax.post Pusher.channel_auth_endpoint, { socket_id: socketId, channels: names }, (data) ->
+      Ajax.post Pusher.channel_auth_endpoint, { socket_id: socketId, channels: names }, (data) ->
         channels.fetching = false
         callback(data.channels) for callback in channels.callbacks
 

config/environment.js

@@ -46,8 +46,7 @@ module.exports = function(environment) {
       ENV.endpoints = {
         sshKey: true,
         caches: true
-      }
-
+      };
     }
   }