diff --git a/Gemfile.lock b/Gemfile.lock index 5055ddda..5c8eae9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,7 +43,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-api.git - revision: 8abc3309372e8a9c4e3506cbf45362c49e91b24d + revision: 2b290b9571db627cd796b4d11d5c6153b8d649c1 specs: travis-api (0.0.1) backports (~> 2.5) @@ -61,7 +61,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 94dbbf2fea57b56383e26152ae3a4cece02d2df0 + revision: 05ea6a6696b3be32839afcaa126afaf3f2522536 branch: sf-travis-api specs: travis-core (0.0.1) diff --git a/assets/images/ui/close.png b/assets/images/ui/close.png new file mode 100644 index 00000000..40d1f626 Binary files /dev/null and b/assets/images/ui/close.png differ diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 07d601e0..2500cae7 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -1,6 +1,6 @@ require 'travis/model' -@Travis.Build = Travis.Model.extend Travis.DurationCalculations, +@Travis.Build = Travis.Model.extend Travis.DurationCalculations, Travis.Ajax, eventType: DS.attr('string') repoId: DS.attr('number') commitId: DS.attr('number') @@ -26,6 +26,10 @@ require 'travis/model' @get('data.job_ids.length') > 1 ).property('data.job_ids.length') + isFinished: (-> + @get('state') == 'finished' + ).property('state') + requiredJobs: (-> @get('jobs').filter (data) -> !data.get('allowFailure') ).property('jobs.@each.allowFailure') @@ -41,6 +45,10 @@ require 'travis/model' $.map(headers.concat(keys), (key) -> return $.camelize(key)) ).property('config') + requeue: (-> + @post '/requests', build_id: @get('id') + ) + @Travis.Build.reopenClass byRepoId: (id, parameters) -> @find($.extend(parameters || {}, repository_id: id)) diff --git a/assets/scripts/app/models/user.coffee b/assets/scripts/app/models/user.coffee index 62f1aa4d..5e453fd0 100644 --- a/assets/scripts/app/models/user.coffee +++ b/assets/scripts/app/models/user.coffee @@ -27,7 +27,7 @@ require 'travis/model' permissions: (-> unless @permissions @permissions = Ember.ArrayProxy.create() - @ajax '/users/permissions', 'get', success: (data) => @permissions.set('content', data).permissions + @ajax '/users/permissions', 'get', success: (data) => @permissions.set('content', data.permissions) @permissions ).property() diff --git a/assets/scripts/app/templates/jobs/list.hbs b/assets/scripts/app/templates/jobs/list.hbs index 43f3a751..c0be30be 100644 --- a/assets/scripts/app/templates/jobs/list.hbs +++ b/assets/scripts/app/templates/jobs/list.hbs @@ -43,6 +43,7 @@ {{#unless view.required}}