From 84010f63c40e35b10d93d121c4fee01f65016988 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 17 Feb 2015 13:35:58 +0100 Subject: [PATCH 01/13] Update Ember.js to 1.10 --- Brocfile.js | 7 ++++++- bower.json | 2 +- package.json | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Brocfile.js b/Brocfile.js index 16bcd676..89133ebc 100644 --- a/Brocfile.js +++ b/Brocfile.js @@ -21,7 +21,12 @@ if (process.env.DISABLE_FINGERPRINTS) { } var app = new EmberApp({ - fingerprint: fingerprint + fingerprint: fingerprint, + vendorFiles: { + // next line is needed to prevent ember-cli to load + // handlebars (it happens automatically in 0.1.x) + 'handlebars.js': null + } }); app.import('bower_components/pusher/dist/pusher.js'); diff --git a/bower.json b/bower.json index 41e6caee..8e2933a2 100644 --- a/bower.json +++ b/bower.json @@ -3,7 +3,7 @@ "dependencies": { "handlebars": "2.0.0", "jquery": "^1.11.1", - "ember": "1.9.1", + "ember": "1.10.0", "ember-data": "1.0.0-beta.14", "ember-resolver": "~0.1.11", "loader.js": "ember-cli/loader.js#1.0.1", diff --git a/package.json b/package.json index ee197165..5541d5cc 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "ember-cli-content-security-policy": "0.3.0", "ember-cli-dependency-checker": "0.0.7", "ember-cli-document-title": "0.0.1", - "ember-cli-htmlbars": "^0.6.0", + "ember-cli-htmlbars": "^0.7.0", "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", "ember-cli-inline-images": "^0.0.4", From 9b58ff45b6e372cb2f1594aefcfe4ec64b50a7e0 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 17 Feb 2015 13:36:40 +0100 Subject: [PATCH 02/13] Rewrite format-message to HTMLBars helper --- app/helpers/format-message.coffee | 4 ++-- app/templates/build.hbs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/helpers/format-message.coffee b/app/helpers/format-message.coffee index 720c6b56..ac38c784 100644 --- a/app/helpers/format-message.coffee +++ b/app/helpers/format-message.coffee @@ -1,7 +1,7 @@ `import { formatMessage as _formatMessage, safe } from 'travis/utils/helpers'` `import Ember from "ember"` -helper = Ember.Handlebars.makeBoundHelper (message, options) -> - safe _formatMessage(message, options.hash) +helper = Ember.HTMLBars.makeBoundHelper (params, hash) -> + safe _formatMessage(params[0], hash) `export default helper` diff --git a/app/templates/build.hbs b/app/templates/build.hbs index d467cdb4..bdd36126 100644 --- a/app/templates/build.hbs +++ b/app/templates/build.hbs @@ -14,14 +14,14 @@ {{build.pullRequestTitle}} {{else}} {{build.commit.branch}} - {{format-message build.commit.subject repoBinding=build.repo}} + {{format-message build.commit.subject repo=build.repo}} {{/if}}
{{#if build.pullRequest}} -

{{format-message build.commit.subject repoBinding=build.repo}}

+

{{format-message build.commit.subject repo=build.repo}}

{{/if}} - 
{{format-message build.commit.body repoBinding=build.repo pre=true}}
+ 
{{format-message build.commit.body repo=build.repo pre=true}}
{{#if commit.authorName}} From 397600c46d17b6d8609a71a10723614426c8e705 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Mon, 23 Mar 2015 17:35:09 +0100 Subject: [PATCH 03/13] Fix HTML based on HTMLBars errors --- app/templates/build.hbs | 1 + app/templates/components/build-repo-actions.hbs | 2 +- app/templates/components/job-repo-actions.hbs | 2 +- app/templates/components/repo-actions.hbs | 2 +- app/templates/job.hbs | 1 + app/templates/queue.hbs | 9 ++++----- app/templates/repo.hbs | 3 ++- app/templates/running-jobs.hbs | 9 ++++----- app/templates/settings/index.hbs | 2 +- 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/templates/build.hbs b/app/templates/build.hbs index bdd36126..69d77943 100644 --- a/app/templates/build.hbs +++ b/app/templates/build.hbs @@ -61,6 +61,7 @@
  • {{#if build.isFinished}}ran{{else}}running{{/if}} for {{format-duration build.duration}} +
  • {{format-time build.finishedAt}} diff --git a/app/templates/components/build-repo-actions.hbs b/app/templates/components/build-repo-actions.hbs index 9b00cd3b..163eee0f 100644 --- a/app/templates/components/build-repo-actions.hbs +++ b/app/templates/components/build-repo-actions.hbs @@ -14,7 +14,7 @@ {{else}} - + {{/if}} {{/if}} diff --git a/app/templates/components/job-repo-actions.hbs b/app/templates/components/job-repo-actions.hbs index a02d9fd1..68db5cff 100644 --- a/app/templates/components/job-repo-actions.hbs +++ b/app/templates/components/job-repo-actions.hbs @@ -13,7 +13,7 @@ {{else}} - + {{/if}} {{/if}} diff --git a/app/templates/components/repo-actions.hbs b/app/templates/components/repo-actions.hbs index 7a2f4e24..3ba1fddd 100644 --- a/app/templates/components/repo-actions.hbs +++ b/app/templates/components/repo-actions.hbs @@ -11,7 +11,7 @@ {{#if displayCodeClimate}} + title="Test Coverage with Code Climate"> {{/if}} diff --git a/app/templates/job.hbs b/app/templates/job.hbs index 95bb366e..31e2d6b6 100644 --- a/app/templates/job.hbs +++ b/app/templates/job.hbs @@ -49,6 +49,7 @@
  • {{#if job.isFinished}}ran{{else}}running{{/if}} for {{format-duration job.duration}} +
  • {{format-time job.finishedAt}} diff --git a/app/templates/queue.hbs b/app/templates/queue.hbs index 76fdcf0f..e780f625 100644 --- a/app/templates/queue.hbs +++ b/app/templates/queue.hbs @@ -2,11 +2,10 @@ {{#if length}} {{#each job in controller}}
    - {{#if job.repo.slug}} - - {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}} - {{/if}} - + {{#if job.repo.slug}} + + {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}} + {{/if}}

    diff --git a/app/templates/repo.hbs b/app/templates/repo.hbs index dc4e2c2e..f2f7de4b 100644 --- a/app/templates/repo.hbs +++ b/app/templates/repo.hbs @@ -19,12 +19,13 @@

    {{view 'repo-show-tools'}} - + {{view 'repo-show-tabs'}}
    {{outlet}}
    +
    {{else}} diff --git a/app/templates/running-jobs.hbs b/app/templates/running-jobs.hbs index d039ae2d..0c12c853 100644 --- a/app/templates/running-jobs.hbs +++ b/app/templates/running-jobs.hbs @@ -2,11 +2,10 @@ {{#if controller.length}} {{#each job in controller}}
    - {{#if job.repo.slug}} - - {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}} - {{/if}} - + {{#if job.repo.slug}} + + {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}} + {{/if}}

    diff --git a/app/templates/settings/index.hbs b/app/templates/settings/index.hbs index ae97ba2d..eb576cb7 100644 --- a/app/templates/settings/index.hbs +++ b/app/templates/settings/index.hbs @@ -15,7 +15,7 @@

    -

    +

    {{input value=settings.maximum_number_of_builds size="4" pattern='/^[0-9]+$/'}}