From df54fc58072b1d9b90cd0da4cdc1d14b1c96dede Mon Sep 17 00:00:00 2001 From: Alexandre Ardhuin Date: Sun, 14 Dec 2014 14:57:05 +0100 Subject: [PATCH 1/4] Dart support --- assets/scripts/travis.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index 4177d101..7030d88e 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -111,6 +111,7 @@ $.extend Travis, d: 'D' julia: 'Julia' csharp: 'C#' + dart: 'Dart' } QUEUES: [ From 584157dba7c38537e639103b968a14cdd0f6ae66 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 22 Jan 2015 17:21:53 +0100 Subject: [PATCH 2/4] fix alignment --- assets/styles/main/repository.sass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/styles/main/repository.sass b/assets/styles/main/repository.sass index 314857f4..1b74bef8 100644 --- a/assets/styles/main/repository.sass +++ b/assets/styles/main/repository.sass @@ -11,6 +11,8 @@ margin-right: 5px .status-image + position: relative + top: 1px width: 90px height: 25px display: inline-block @@ -19,7 +21,7 @@ a#status-image-popup display: inline-block opacity: 1.0 - margin-top: 8px + //margin-top: 8px img border: none @@ -28,6 +30,8 @@ width: 21px height: 21px display: inline-block + position: relative + top: 1px .github-icon img From 4d78f232c3501c2d930f3321073735ea726626bc Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 22 Jan 2015 19:59:39 +0100 Subject: [PATCH 3/4] Properly normalized data for job:received pusher event --- assets/scripts/app/pusher.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/app/pusher.coffee b/assets/scripts/app/pusher.coffee index 74802a85..e610a265 100644 --- a/assets/scripts/app/pusher.coffee +++ b/assets/scripts/app/pusher.coffee @@ -86,7 +86,7 @@ $.extend Travis.Pusher.prototype, switch event when 'build:started', 'build:finished' data - when 'job:created', 'job:started', 'job:requeued', 'job:finished', 'job:log', 'job:canceled' + when 'job:created', 'job:started', 'job:requeued', 'job:finished', 'job:log', 'job:canceled', 'job:received' data.queue = data.queue.replace('builds.', '') if data.queue { job: data } when 'worker:added', 'worker:updated', 'worker:removed' From 331ccafc87fe637f140add3e71919cbdf3f3ed77 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 23 Jan 2015 10:36:41 +0100 Subject: [PATCH 4/4] Put jobs with 'received' status to the running jobs list The problem with running jobs list was that it didn't show jobs that went to the worker. The result was a confusing UI - when you look at the running jobs list you want to know how many concurrent jobs you are using, including jobs that are still waiting for a VM to boot. --- assets/scripts/app/models/job.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index b1d20d25..eb847c1c 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -158,7 +158,7 @@ require 'travis/model' filtered = Ember.FilteredRecordArray.create( modelClass: Travis.Job filterFunction: (job) -> - job.get('state') == 'started' + ['started', 'received'].indexOf(job.get('state')) != -1 filterProperties: ['state'] )