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

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

Browse Source
This commit is contained in:
Lisa Passing 2015-02-06 15:28:18 +01:00
commit e784301bb0
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/routes/ssh-key.coffee
View File

@ -6,7 +6,7 @@ Route = TravisRoute.extend
model: (params) -> model: (params) ->
repo = @modelFor('repo') repo = @modelFor('repo')
self = this 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 xhr.status == 404
# if there is no model, just return null. I'm not sure if this is the # 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 # best answer, maybe we should just redirect to different route, like

2
app/templates/repos/show/tools.hbs
View File

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

3
app/templates/settings.hbs
View File

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

3
app/utils/pusher.coffee
View File

@ -1,4 +1,5 @@
`import ENV from 'travis/config/environment'` `import ENV from 'travis/config/environment'`
`import Ajax from 'travis/utils/ajax'`
TravisPusher = (config) -> TravisPusher = (config) ->
@init(config) @init(config)
@ -117,7 +118,7 @@ if ENV.pro
unless channels.fetching unless channels.fetching
channels.fetching = true 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 channels.fetching = false
callback(data.channels) for callback in channels.callbacks callback(data.channels) for callback in channels.callbacks

3
config/environment.js
View File

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