From 74dc2bc339e7661201f5e679dac9a3c425852824 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 16 Jul 2013 00:29:27 +0200 Subject: [PATCH 01/10] Reset parts when fetching log --- assets/scripts/app/models/log.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/scripts/app/models/log.coffee b/assets/scripts/app/models/log.coffee index 63df7690..c0c74dd7 100644 --- a/assets/scripts/app/models/log.coffee +++ b/assets/scripts/app/models/log.coffee @@ -15,6 +15,7 @@ require 'travis/chunk_buffer' fetch: -> console.log 'log model: fetching log' if Log.DEBUG + @setParts() handlers = json: (json) => @loadParts(json['log']['parts']) text: (text) => @loadText(text) From 831540af8868b72758f6d08158d0ee9ae5caec7e Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 17 Jul 2013 17:48:56 +0200 Subject: [PATCH 02/10] Fix link to PR on build/job page --- assets/scripts/app/templates/builds/show.hbs | 2 +- assets/scripts/app/templates/jobs/show.hbs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index 29458ed3..495456b3 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -26,7 +26,7 @@
{{formatCommit this}}
{{#if ../build.pullRequest}}
{{t builds.pull_request}}
-
#{{build.pullRequestNumber}} {{build.pullRequestTitle}}
+
#{{build.pullRequestNumber}} {{build.pullRequestTitle}}
{{else}} {{#if compareUrl}}
{{t builds.compare}}
diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs index a3c62f4d..2ac4e130 100644 --- a/assets/scripts/app/templates/jobs/show.hbs +++ b/assets/scripts/app/templates/jobs/show.hbs @@ -25,7 +25,11 @@
{{formatCommit this}}
{{#if ../job.build.pullRequest}}
{{t builds.pull_request}}
-
#{{job.build.pullRequestNumber}} {{job.build.pullRequestTitle}}
+
+ {{#if compareUrl}} + #{{job.build.pullRequestNumber}} {{job.build.pullRequestTitle}} + {{/if}} +
{{else}} {{#if compareUrl}}
{{t jobs.compare}}
From 76af32013bc3ab1e5f540d69da3a97c3fec1e7e9 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 23 Jul 2013 17:13:29 +0200 Subject: [PATCH 03/10] Fix updating times on repo page --- assets/scripts/app/controllers/repo.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/app/controllers/repo.coffee b/assets/scripts/app/controllers/repo.coffee index ff9b2b77..8c66b10d 100644 --- a/assets/scripts/app/controllers/repo.coffee +++ b/assets/scripts/app/controllers/repo.coffee @@ -14,7 +14,7 @@ Travis.RepoController = Travis.Controller.extend if builds = @get('builds') builds.forEach (b) -> b.updateTimes() - if build = @get('build') + if build = @get('controllers.build.build') build.updateTimes() if build && jobs = build.get('jobs') From 73213153fe72d8416ebca3b707d5cda68fcd17c8 Mon Sep 17 00:00:00 2001 From: Henrik Hodne Date: Wed, 24 Jul 2013 16:02:32 -0700 Subject: [PATCH 04/10] Fix secure.travis-ci.org redirect `fullpath` starts with SCRIPT_NAME. From the Rack spec: > The SCRIPT_NAME, if non-empty, must start with / Fixes travis-ci/travis-ci#1278. --- config.ru | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.ru b/config.ru index f3272ca3..b9a55f43 100644 --- a/config.ru +++ b/config.ru @@ -9,7 +9,7 @@ class RedirectSubdomain < Struct.new(:app, :from) def call(env) request = Rack::Request.new(env) if request.host == from - [301, { 'Location' => "https://travis-ci.org/#{request.fullpath}", 'Content-Type' => 'text/html' }, []] + [301, { 'Location' => "https://travis-ci.org#{request.fullpath}", 'Content-Type' => 'text/html' }, []] else app.call(env) end From d12bb1e8e483986d249fed1300a203117684a328 Mon Sep 17 00:00:00 2001 From: Floyd Pink Date: Fri, 26 Jul 2013 17:27:27 -0400 Subject: [PATCH 05/10] a) author/committer emails on build page and b) PR on job page --- assets/scripts/app/templates/builds/show.hbs | 4 ++-- assets/scripts/app/templates/jobs/show.hbs | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index 495456b3..fe33881b 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -35,11 +35,11 @@ {{/if}} {{#if authorName}}
{{t builds.author}}
-
{{authorName}}
+
{{authorName}}
{{/if}} {{#if committerName}}
{{t builds.committer}}
-
{{committerName}}
+
{{committerName}}
{{/if}} {{/with}} diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs index 2ac4e130..201c3df9 100644 --- a/assets/scripts/app/templates/jobs/show.hbs +++ b/assets/scripts/app/templates/jobs/show.hbs @@ -26,9 +26,7 @@ {{#if ../job.build.pullRequest}}
{{t builds.pull_request}}
- {{#if compareUrl}} - #{{job.build.pullRequestNumber}} {{job.build.pullRequestTitle}} - {{/if}} + #{{job.build.pullRequestNumber}} {{job.build.pullRequestTitle}}
{{else}} {{#if compareUrl}} From 4bc4d10e7d9ff71334913ca821dc139736b4a9e5 Mon Sep 17 00:00:00 2001 From: alonisser Date: Tue, 16 Jul 2013 07:53:31 +0300 Subject: [PATCH 06/10] Add Rst status image format Close #192. --- assets/scripts/app/templates/status_images.hbs | 4 ++++ assets/scripts/app/views/status_images.coffee | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/assets/scripts/app/templates/status_images.hbs b/assets/scripts/app/templates/status_images.hbs index 47cd3477..f36edc5e 100644 --- a/assets/scripts/app/templates/status_images.hbs +++ b/assets/scripts/app/templates/status_images.hbs @@ -27,3 +27,7 @@

+

+ + +

diff --git a/assets/scripts/app/views/status_images.coffee b/assets/scripts/app/views/status_images.coffee index 12184148..935df8d2 100644 --- a/assets/scripts/app/views/status_images.coffee +++ b/assets/scripts/app/views/status_images.coffee @@ -51,3 +51,7 @@ Travis.StatusImagesView = Em.View.extend asciidocStatusImage: (-> "image:#{@get('statusImageUrl')}[\"Build Status\", link=\"#{@get('urlRepo')}\"]" ).property('statusImageUrl') + + rstStatusImage: (-> + ".. image:: #{@get('statusImageUrl')} :target: #{@get('urlRepo')}" + ).property('statusImageUrl') From fd988478639ce1af24f7c01c5541e5ea883be33f Mon Sep 17 00:00:00 2001 From: Floyd Pink Date: Sat, 27 Jul 2013 16:11:12 -0400 Subject: [PATCH 07/10] show loading indicator on show-more button click --- assets/scripts/app/controllers/builds.coffee | 1 + assets/scripts/app/templates/builds/list.hbs | 3 +++ assets/scripts/app/views/build.coffee | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/scripts/app/controllers/builds.coffee b/assets/scripts/app/controllers/builds.coffee index 8bfb61da..76234a22 100644 --- a/assets/scripts/app/controllers/builds.coffee +++ b/assets/scripts/app/controllers/builds.coffee @@ -7,6 +7,7 @@ Travis.BuildsController = Em.ArrayController.extend repoBinding: 'controllers.repo.repo' tabBinding: 'controllers.repo.tab' isLoadedBinding: 'content.isLoaded' + isLoadingBinding: 'content.isLoading' showMore: -> id = @get('repo.id') diff --git a/assets/scripts/app/templates/builds/list.hbs b/assets/scripts/app/templates/builds/list.hbs index 317594aa..20e6c687 100644 --- a/assets/scripts/app/templates/builds/list.hbs +++ b/assets/scripts/app/templates/builds/list.hbs @@ -62,6 +62,9 @@ {{#if displayShowMoreButton}}

{{view view.ShowMoreButton}} + {{#if isLoading}} + + {{/if}}

{{/if}} {{else}} diff --git a/assets/scripts/app/views/build.coffee b/assets/scripts/app/views/build.coffee index 9b2ed95d..f0a79958 100644 --- a/assets/scripts/app/views/build.coffee +++ b/assets/scripts/app/views/build.coffee @@ -11,7 +11,7 @@ Travis.reopen tagName: 'button' classNameBindings: ['isLoading'] attributeBindings: ['disabled'] - isLoadingBinding: 'controller.builds.isLoading' + isLoadingBinding: 'controller.isLoading' template: Em.Handlebars.compile('{{view.label}}') disabledBinding: 'isLoading' From d248fd11a62761714064dae29c117680fb9f3c10 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Mon, 5 Aug 2013 02:35:28 +0200 Subject: [PATCH 08/10] Fix messages on empty repos list --- assets/scripts/app/controllers/repos.coffee | 11 +++++++++++ assets/scripts/app/templates/repos/list.hbs | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/assets/scripts/app/controllers/repos.coffee b/assets/scripts/app/controllers/repos.coffee index 55a9df1f..c230877a 100644 --- a/assets/scripts/app/controllers/repos.coffee +++ b/assets/scripts/app/controllers/repos.coffee @@ -83,3 +83,14 @@ Travis.ReposController = Ember.ArrayController.extend @searchLater = Ember.run.later(this, (-> @activate 'search', search: phrase ), 500) + + noReposMessage: (-> + tab = @get('tab') + + if tab == 'owned' + 'You don\'t have any repos set up on Travis CI' + else if tab == 'recent' + 'Repositories could not be loaded' + else + 'Could not find any repos' + ).property('tab') diff --git a/assets/scripts/app/templates/repos/list.hbs b/assets/scripts/app/templates/repos/list.hbs index f8cfaf70..8ac327b1 100644 --- a/assets/scripts/app/templates/repos/list.hbs +++ b/assets/scripts/app/templates/repos/list.hbs @@ -30,7 +30,7 @@
{{/with}} {{else}} -

You don't have any repos set up on Travis CI

+

{{noReposMessage}}

{{/collection}} {{else}}
Loading
From 590bd87e3882b635c70d7d8d0c27d8a89f7607be Mon Sep 17 00:00:00 2001 From: alonisser Date: Mon, 5 Aug 2013 15:48:14 -0700 Subject: [PATCH 09/10] Change height of status image popup to include all formats Close #196. --- assets/styles/app/popup.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/styles/app/popup.sass b/assets/styles/app/popup.sass index 5dda2148..119c63c2 100644 --- a/assets/styles/app/popup.sass +++ b/assets/styles/app/popup.sass @@ -44,7 +44,7 @@ #status-images display: none width: 600px - height: 230px + height: 250px margin: -95px 0 0 -300px p From c92720f2805e9ce3cc03882f531c3b8246353eee Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 6 Aug 2013 12:51:35 +0200 Subject: [PATCH 10/10] Fix displaying pull request number on builds' list Commit sometimes does not have information about pull request (probably when payload is coming from pusher). --- assets/scripts/app/templates/builds/list.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/app/templates/builds/list.hbs b/assets/scripts/app/templates/builds/list.hbs index 20e6c687..41e7a038 100644 --- a/assets/scripts/app/templates/builds/list.hbs +++ b/assets/scripts/app/templates/builds/list.hbs @@ -45,7 +45,7 @@ {{#if view.isPullRequestsList}} - #{{commit.pullRequestNumber}} + #{{pullRequestNumber}} {{/if}}