Merge branch 'master' of github.com:travis-ci/travis-web

This commit is contained in:
Lisa Passing 2015-02-16 16:11:59 +01:00
commit 407e34e201
4 changed files with 12 additions and 4 deletions

View File

@ -2,7 +2,7 @@
[![Build Status](https://travis-ci.org/travis-ci/travis-web.png?branch=master)](https://travis-ci.org/travis-ci/travis-web)
### Running the app
The app is developed using [http://ember-cli.com](Ember CLI). It requires nodejs
The app is developed using [Ember CLI](http://ember-cli.com). It requires nodejs
with npm installed.
In order to run the app you need to install dependencies with:

View File

@ -14,6 +14,13 @@ Route = TravisRoute.extend
}).then (response) ->
response.repositories.sortBy('last_build.finished_at').filter( (repo) ->
repo.last_build
).sort( (a, b) ->
if !a.last_build.finished_at || a.last_build.finished_at > b.last_build.finished_at
return -1
else if !b.last_build.finished_at || b.last_build.finished_at > a.last_build.finished_at
return 1
else
return 0
).map( (repo) ->
Ember.Object.create(repo)
)

View File

@ -19,7 +19,7 @@ Route = TravisRoute.extend
activate: ->
# subscribe to pusher only if we're at a main route
unless config.pro
@get('pusher').subscribeAll(['common'])
if !config.pro && @pusher
@pusher.subscribeAll(['common'])
`export default Route`

View File

@ -39,6 +39,7 @@ email = (email) ->
"mailto:#{email}"
gravatarImage = (email, size) ->
"https://www.gravatar.com/avatar/#{md5(email)}?s=#{size}&d=#{encodeURIComponent(config.avatar_default_url)}"
avatarDefaultUrl = 'https://travis-ci.org/images/ui/default-avatar.png'
"https://www.gravatar.com/avatar/#{md5(email)}?s=#{size}&d=#{encodeURIComponent(avatarDefaultUrl)}"
`export { plainTextLog, githubPullRequest, githubCommit, githubRepo, githubWatchers, githubNetwork, githubAdmin, statusImage, ccXml, email, gravatarImage }`