From ef045bdcb8f6fdc11d147a2f305c1f9b40db1019 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 23 Jun 2015 17:14:33 +0200 Subject: [PATCH 01/16] detect build.linux in jobs.queue and display notice --- app/models/job.coffee | 5 +++++ app/templates/jobs/pre.hbs | 3 +++ 2 files changed, 8 insertions(+) diff --git a/app/models/job.coffee b/app/models/job.coffee index 37f08934..151eda76 100644 --- a/app/models/job.coffee +++ b/app/models/job.coffee @@ -143,4 +143,9 @@ Job = Model.extend DurationCalculations, "#{@get('repo.slug')} ##{@get('number')}" ).property() + isLegacyInfrastructure: (-> + if @get('queue') == 'builds.linux' + true + ).property('queue') + `export default Job` diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs index e60f99c4..3d48169b 100644 --- a/app/templates/jobs/pre.hbs +++ b/app/templates/jobs/pre.hbs @@ -4,6 +4,9 @@ {{#if view.job.notStarted}}
Hang tight, the log cannot be shown until the build has started.
{{/if}} + {{#if view.job.isLegacyInfrastructure}} +

This job runs on our legacy infrastructure. Read more about upgrading in our docs

+ {{/if}}
{{#if view.canRemoveLog}} From e42a4088e7b9fbe952788493a7480da6c4ce1159 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 23 Jun 2015 17:14:33 +0200 Subject: [PATCH 02/16] detect build.linux in jobs.queue and display notice --- app/models/job.coffee | 5 +++++ app/templates/jobs/pre.hbs | 3 +++ 2 files changed, 8 insertions(+) diff --git a/app/models/job.coffee b/app/models/job.coffee index 37f08934..151eda76 100644 --- a/app/models/job.coffee +++ b/app/models/job.coffee @@ -143,4 +143,9 @@ Job = Model.extend DurationCalculations, "#{@get('repo.slug')} ##{@get('number')}" ).property() + isLegacyInfrastructure: (-> + if @get('queue') == 'builds.linux' + true + ).property('queue') + `export default Job` diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs index e60f99c4..3d48169b 100644 --- a/app/templates/jobs/pre.hbs +++ b/app/templates/jobs/pre.hbs @@ -4,6 +4,9 @@ {{#if view.job.notStarted}}
Hang tight, the log cannot be shown until the build has started.
{{/if}} + {{#if view.job.isLegacyInfrastructure}} +

This job runs on our legacy infrastructure. Read more about upgrading in our docs

+ {{/if}}
{{#if view.canRemoveLog}} From f262ae15f58a68246baae19542b018070f0dc4e6 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 30 Jun 2015 13:28:45 +0200 Subject: [PATCH 03/16] refactor and clean profile templates and styles --- app/styles/app/layouts/profile.sass | 26 +++++++++++++----- app/templates/components/hooks-list-item.hbs | 4 +-- app/templates/profile/show.hbs | 29 ++------------------ app/templates/profile/tabs/user.hbs | 3 +- 4 files changed, 25 insertions(+), 37 deletions(-) diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 49df720b..2cec16ca 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -3,6 +3,13 @@ font-weight: 400 .profile-main + padding: 0 $column-gutter/2 + + @media #{$medium-up} + width: grid-calc(8, 12) + float: right + padding: 0 0 0 $column-gutter/2 + header h1 margin: 0 1.7rem 0 0 @@ -55,7 +62,10 @@ figcaption width: 90% margin: auto - padding: 0 0 0 2.8em + padding: 0 1em 0 2.8em + text-align: center + @media #{$medium-up} + text-align: left img display: block margin: 0 auto 1em @@ -125,17 +135,18 @@ p.profile-user-last .profile-hooklist @include resetul font-size: $font-size-m - color: #7a7a7a li clear: both margin-bottom: .8em - overflow: auto + // overflow: auto .profile-hooks width: grid-calc(10, 24) + display: inline-block + vertical-align: middle @media #{$medium-up} - width: grid-calc(7, 24) + width: grid-calc(5, 24) - 1% @media #{$large-up} - width: grid-calc(5, 24) + width: grid-calc(5, 24) - 1% .switch display: inline-block vertical-align: middle @@ -158,7 +169,8 @@ p.profile-user-last .profile-repo @extend %border-radius-4px position: relative - width: grid-calc(14, 24) + display: inline-block + width: grid-calc(13, 24) padding: .25em .5em .3em white-space: nowrap overflow: hidden @@ -182,7 +194,7 @@ p.profile-user-last content: "" @include fadeOut(right, -90deg, #e2eee2) @media #{$medium-up} - width: grid-calc(17, 24) + width: grid-calc(18, 24) height: 30px &:hover span diff --git a/app/templates/components/hooks-list-item.hbs b/app/templates/components/hooks-list-item.hbs index 55f94915..dbf0bb1c 100644 --- a/app/templates/components/hooks-list-item.hbs +++ b/app/templates/components/hooks-list-item.hbs @@ -1,4 +1,4 @@ -
+
{{hook-switch hook=hook onToggleError="handleToggleError" onToggle="resetErrors"}} {{#if hook.isSaving}} {{loading-indicator}} @@ -6,7 +6,7 @@ {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}{{/link-to}} {{/if}}
- + {{hook.slug}} {{hook.description}} diff --git a/app/templates/profile/show.hbs b/app/templates/profile/show.hbs index e14bec3b..e772d428 100644 --- a/app/templates/profile/show.hbs +++ b/app/templates/profile/show.hbs @@ -1,28 +1,3 @@ -
- -{{!-- {{#if config.billingEndpoint}} -
- {{#if view.subscribed}} - - Subscription active! - - {{else}} - {{#if view.education}} - - Educational account! - - {{else}} - - Sign up this account! - - {{/if}} - {{/if}} -
- {{/if}} --}} - - {{!-- {{view 'profile-tabs'}} --}} - - {{!--
--}} - {{outlet}} - {{!--
--}} +
+ {{outlet}}
diff --git a/app/templates/profile/tabs/user.hbs b/app/templates/profile/tabs/user.hbs index 93ee5043..8579dff7 100644 --- a/app/templates/profile/tabs/user.hbs +++ b/app/templates/profile/tabs/user.hbs @@ -1,4 +1,4 @@ - +{{!--
@@ -26,3 +26,4 @@
+ --}} \ No newline at end of file From fa7472c1720e9b8cf6ca9fb14c8616bcc66e1e4d Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 30 Jun 2015 16:12:04 +0200 Subject: [PATCH 04/16] add notice styles --- app/styles/app.scss | 1 + app/styles/app/modules/icons.sass | 3 +++ app/styles/app/modules/notice.sass | 16 ++++++++++++++++ app/templates/jobs/pre.hbs | 2 +- public/images/svg/notice-flag.svg | 7 +++++++ 5 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 app/styles/app/modules/notice.sass create mode 100644 public/images/svg/notice-flag.svg diff --git a/app/styles/app.scss b/app/styles/app.scss index 764e55ba..e3cdcc54 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -38,6 +38,7 @@ @import "app/modules/media"; @import "app/modules/switch"; @import "app/modules/memberlist"; +@import "app/modules/notice"; @import "app/layout"; @import "app/layouts/dashboard"; diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index f10322c2..ec27b927 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -192,3 +192,6 @@ border-left : 5px solid transparent border-right : 5px solid transparent border-top : 5px solid $dashboard-text-color + +.icon-flag + background-image: inline-image('svg/notice-flag.svg') diff --git a/app/styles/app/modules/notice.sass b/app/styles/app/modules/notice.sass new file mode 100644 index 00000000..0bb6b34f --- /dev/null +++ b/app/styles/app/modules/notice.sass @@ -0,0 +1,16 @@ +.notice + padding: 0.3em 0.5em 0.2em + margin-bottom: .5em + background-color: #F9F3D3 + color: #AF9112 + border-radius: 4px + a + color: #AF9112 + text-decoration: underline + + .icon-flag + @extend %icon + width: 1.3em + height: 1.5em + margin: 0 .6em 0 .2em + vertical-align: middle \ No newline at end of file diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs index 3d48169b..44ddda6f 100644 --- a/app/templates/jobs/pre.hbs +++ b/app/templates/jobs/pre.hbs @@ -5,7 +5,7 @@
Hang tight, the log cannot be shown until the build has started.
{{/if}} {{#if view.job.isLegacyInfrastructure}} -

This job runs on our legacy infrastructure. Read more about upgrading in our docs

+

This job runs on our legacy infrastructure. Read more about upgrading in our docs

{{/if}}
diff --git a/public/images/svg/notice-flag.svg b/public/images/svg/notice-flag.svg new file mode 100644 index 00000000..16ab669c --- /dev/null +++ b/public/images/svg/notice-flag.svg @@ -0,0 +1,7 @@ + + + + + From 78d16542b32014a7b439df85a87d15b49d465c51 Mon Sep 17 00:00:00 2001 From: Paul Cochrane Date: Tue, 30 Jun 2015 23:12:20 +0200 Subject: [PATCH 05/16] Add Perl6 to matrix --- app/utils/keys-map.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app/utils/keys-map.coffee b/app/utils/keys-map.coffee index 7f6a7236..89c9b703 100644 --- a/app/utils/keys-map.coffee +++ b/app/utils/keys-map.coffee @@ -3,6 +3,7 @@ languageConfigKeys = { php: 'PHP' node_js: 'Node.js' perl: 'Perl' + perl6: 'Perl6' python: 'Python' scala: 'Scala' ruby: 'Ruby' From a59723cf6718d2ca882c5875f1931fafc6b5737d Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 8 Jul 2015 15:05:19 +0200 Subject: [PATCH 06/16] add link to the right docs page --- app/templates/jobs/pre.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs index 44ddda6f..5372bffe 100644 --- a/app/templates/jobs/pre.hbs +++ b/app/templates/jobs/pre.hbs @@ -5,7 +5,7 @@
Hang tight, the log cannot be shown until the build has started.
{{/if}} {{#if view.job.isLegacyInfrastructure}} -

This job runs on our legacy infrastructure. Read more about upgrading in our docs

+

This job runs on our legacy infrastructure. Read more about upgrading in our docs

{{/if}}
From 0bc1b030418590373b83467337fb0dc61b50338f Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 9 Jul 2015 17:41:34 +0200 Subject: [PATCH 07/16] proper copy --- app/templates/jobs/pre.hbs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs index 5372bffe..4308e3b4 100644 --- a/app/templates/jobs/pre.hbs +++ b/app/templates/jobs/pre.hbs @@ -4,9 +4,19 @@ {{#if view.job.notStarted}}
Hang tight, the log cannot be shown until the build has started.
{{/if}} + + {{#if view.job.isLegacyInfrastructure}} -

This job runs on our legacy infrastructure. Read more about upgrading in our docs

+ {{#if view.job.isFinished}} +

+ This job ran on our legacy infrastructure. Please read our docs on how to upgrade

+ {{else}} +

+ This job is running on our legacy infrastructure. Please read our docs on how to upgrade

+ {{/if}} {{/if}} + +
{{#if view.canRemoveLog}} From 79144d6d48ecf6b246ef4fd50a82ef94a5a789a1 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 9 Jul 2015 17:53:04 +0200 Subject: [PATCH 08/16] unorphan sigin in page copy --- app/templates/auth/signin.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/auth/signin.hbs b/app/templates/auth/signin.hbs index 6dcef908..c5af9b3d 100644 --- a/app/templates/auth/signin.hbs +++ b/app/templates/auth/signin.hbs @@ -2,8 +2,8 @@ {{/if}} -

Hey, we're so glad you're here!

-

In order to view your repositories, please sign in.

+

Hey, we're so glad
you're here!

+

In order to view your repositories,
please sign in.

From 342ee75964aa98b562316f79a5eb6d6d216d015e Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 9 Jul 2015 18:46:33 +0200 Subject: [PATCH 09/16] update legacy update link --- app/templates/jobs/pre.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs index 4308e3b4..d4ac9526 100644 --- a/app/templates/jobs/pre.hbs +++ b/app/templates/jobs/pre.hbs @@ -9,10 +9,10 @@ {{#if view.job.isLegacyInfrastructure}} {{#if view.job.isFinished}}

- This job ran on our legacy infrastructure. Please read our docs on how to upgrade

+ This job ran on our legacy infrastructure. Please read our docs on how to upgrade

{{else}}

- This job is running on our legacy infrastructure. Please read our docs on how to upgrade

+ This job is running on our legacy infrastructure. Please read our docs on how to upgrade

{{/if}} {{/if}} From 7e811e3f81648eba686cc4409b1b9b93c98e0c5f Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 9 Jul 2015 19:29:02 +0200 Subject: [PATCH 10/16] again icon positioning --- app/styles/app/layouts/buildheader.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/styles/app/layouts/buildheader.sass b/app/styles/app/layouts/buildheader.sass index 7243dd6a..d1050319 100644 --- a/app/styles/app/layouts/buildheader.sass +++ b/app/styles/app/layouts/buildheader.sass @@ -129,10 +129,10 @@ background-color: darken($grey-medium, 10) .icon--trigger width: .95em - height: 1.15em + height: 1.2em .icon--cancel width: 1em - height: 1.05em + height: 1em .icon--codeclimate width: 1.2em height: 1.1em From 68e1f5cc7c1900fe74cd9bc5b8fee3927931c94f Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 9 Jul 2015 20:10:17 +0200 Subject: [PATCH 11/16] only show legacy note when logged in --- app/templates/jobs/pre.hbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs index d4ac9526..ccab24bc 100644 --- a/app/templates/jobs/pre.hbs +++ b/app/templates/jobs/pre.hbs @@ -5,7 +5,7 @@
Hang tight, the log cannot be shown until the build has started.
{{/if}} - +{{#if auth.signedIn}} {{#if view.job.isLegacyInfrastructure}} {{#if view.job.isFinished}}

@@ -15,6 +15,7 @@ This job is running on our legacy infrastructure. Please read our docs on how to upgrade

{{/if}} {{/if}} +{{/if}}
From 1ec639e930ace7e9c973adbdd9b78de9e8305564 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Fri, 10 Jul 2015 10:31:32 +0200 Subject: [PATCH 12/16] fix broken link on getting_started --- app/templates/getting-started.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/getting-started.hbs b/app/templates/getting-started.hbs index b69a21f9..76b8a599 100644 --- a/app/templates/getting-started.hbs +++ b/app/templates/getting-started.hbs @@ -25,7 +25,7 @@

Note: The language value is case-sensitive. If you set language: C, for example, your project will be considered a Ruby project.

-

Here you can find some of our basic language examples.

+

Here you can find some of our basic language examples.

  • From 800db73e968b6ede119e44de054d43c609f17852 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Mon, 13 Jul 2015 15:05:45 +0200 Subject: [PATCH 13/16] Test using PhantomJS on PRs, otherwise test also browsers on SL --- .travis.yml | 7 +++++++ ci/prepare_testem.rb | 10 ++++++++++ package.json | 2 +- testem.json | 4 +++- 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ci/prepare_testem.rb diff --git a/.travis.yml b/.travis.yml index cac9691b..8f0481f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,12 +29,19 @@ cache: before_install: - "npm config set spin false" - "npm install -g npm@^2" + - mkdir travis-phantomjs + - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 + - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs + - export PATH=$PWD/travis-phantomjs:$PATH install: - npm install -g bower - npm install - bower install +before_script: + - ruby ci/prepare_testem.rb + script: - ember try $EMBER_VERSION diff --git a/ci/prepare_testem.rb b/ci/prepare_testem.rb new file mode 100644 index 00000000..143268d5 --- /dev/null +++ b/ci/prepare_testem.rb @@ -0,0 +1,10 @@ +require 'json' + +pull_request = ENV['TRAVIS_PULL_REQUEST'] != 'false' + +testem = JSON.parse(File.read('testem.json')) + +testem['launch_in_ci'] = ['PhantomJS'] +testem['launch_in_ci'] += ['SL_chrome', 'SL_firefox'] unless pull_request + +File.open('testem.json', 'w') { |f| f.write testem.to_json } diff --git a/package.json b/package.json index ec6ac9c6..474b9a91 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,6 @@ "ember-cli-uglify": "1.0.1", "ember-data": "1.0.0-beta.16.1", "ember-export-application-global": "^1.0.2", - "ember-try": "0.0.5" + "ember-try": "0.0.7" } } diff --git a/testem.json b/testem.json index 7f180924..5f909db9 100644 --- a/testem.json +++ b/testem.json @@ -3,9 +3,11 @@ "test_page": "tests/index.html?hidepassed", "launch_in_ci": [ "SL_chrome", - "SL_firefox" + "SL_firefox", + "PhantomJS" ], "launch_in_dev": [ + "PhantomJS" ], "launchers": { "SL_chrome": { From 9c0a2780c3fe6deaf1b4674ed53b17990597b432 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Mon, 13 Jul 2015 18:26:43 +0200 Subject: [PATCH 14/16] move feedback button a little more to the left --- app/styles/app/charm.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/app/charm.sass b/app/styles/app/charm.sass index 2b8a89d2..1dae943d 100644 --- a/app/styles/app/charm.sass +++ b/app/styles/app/charm.sass @@ -9,7 +9,7 @@ .feedback-button display: inline-block position: fixed - right: 1% + right: 4% left: auto bottom: 0 margin: 0 From a38309ff05f50334f4a923c83ccecbaf147f4fec Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 14 Jul 2015 11:04:53 +0200 Subject: [PATCH 15/16] Fix displaying a message for a limited log --- app/templates/jobs/pre.hbs | 13 ++++++------- app/views/pre.coffee | 30 +++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs index ccab24bc..ed83852d 100644 --- a/app/templates/jobs/pre.hbs +++ b/app/templates/jobs/pre.hbs @@ -44,13 +44,12 @@ {{#if view.showToTop}} Top {{/if}} - - {{#if view.limited}} -

    - This log is too long to be displayed. Please reduce the verbosity of your - build or download the raw log. -

    - {{/if}}
    • + {{#if view.limited}} +

    + This log is too long to be displayed. Please reduce the verbosity of your + build or download the raw log. +

    + {{/if}} diff --git a/app/views/pre.coffee b/app/views/pre.coffee index 7b6e4d96..708deab4 100644 --- a/app/views/pre.coffee +++ b/app/views/pre.coffee @@ -23,6 +23,24 @@ Log.Scroll.prototype = $.extend new Log.Listener, $('#main').scrollTop(0) $('html, body').scrollTop(element.offset()?.top - (window.innerHeight / 3)) # weird, html works in chrome, body in firefox +Log.Limit = (max_lines, limitedLogCallback) -> + @max_lines = max_lines || 1000 + @limitedLogCallback = limitedLogCallback || (->) + this + +Log.Limit.prototype = Log.extend new Log.Listener, + count: 0, + insert: (log, node, pos) -> + if node.type == 'paragraph' && !node.hidden + @count += 1 + if @limited + @limitedLogCallback() + return @count + +Object.defineProperty Log.Limit.prototype, 'limited', + get: -> + @count >= @max_lines + View = BasicView.extend templateName: 'jobs/pre' currentUserBinding: 'controller.auth.currentUser' @@ -66,7 +84,10 @@ View = BasicView.extend console.log 'log view: create engine' if Log.DEBUG @scroll = new Log.Scroll beforeScroll: => @unfoldHighlight() - @engine = Log.create(limit: Log.LIMIT, listeners: [@scroll]) + @limit = new Log.Limit Log.LIMIT, => + @set('limited', true) + @engine = Log.create(listeners: [@scroll, @limit]) + @engine.limit = @limit @logFolder = new LogFolder(@$().find('#log')) @lineSelector = new LinesSelector(@$().find('#log'), @scroll, @logFolder) @observeParts() @@ -85,13 +106,8 @@ View = BasicView.extend console.log 'log view: parts did change' if Log.DEBUG for part, i in parts.slice(start, start + added) # console.log "limit in log view: #{@get('limited')}" - break if @get('limited') + break if @engine?.limit?.limited @engine.set(part.number, part.content) - @propertyDidChange('limited') - - limited: (-> - @engine?.limit?.limited - ).property() plainTextLogUrl: (-> if id = @get('log.job.id') From 48fc13b7bf527476755640fa772859fcfe5f6355 Mon Sep 17 00:00:00 2001 From: tchak Date: Mon, 6 Jul 2015 17:55:35 +0200 Subject: [PATCH 16/16] stop using deprecated {{bind-attr}} --- app/templates/account.hbs | 10 +++++----- app/templates/annotations/list.hbs | 2 +- app/templates/build.hbs | 20 +++++++++---------- app/templates/caches.hbs | 2 +- app/templates/components/builds-item.hbs | 2 +- app/templates/components/caches-item.hbs | 4 ++-- .../components/code-climate-popup.hbs | 2 +- app/templates/components/hooks-list-item.hbs | 4 ++-- app/templates/components/jobs-item.hbs | 6 +++--- app/templates/components/owner-repo-tile.hbs | 6 +++--- app/templates/components/travis-status.hbs | 2 +- app/templates/dashboard/repositories.hbs | 4 ++-- app/templates/env-vars.hbs | 4 ++-- app/templates/env-vars/_form.hbs | 2 +- app/templates/home.hbs | 4 ++-- app/templates/job.hbs | 18 ++++++++--------- app/templates/jobs.hbs | 16 +++++++-------- app/templates/jobs/pre.hbs | 6 +++--- app/templates/layouts/home.hbs | 6 +++--- app/templates/owner.hbs | 6 +++--- app/templates/profile/accounts.hbs | 6 +++--- app/templates/profile/tabs.hbs | 6 +++--- app/templates/profile/tabs/user.hbs | 6 +++--- app/templates/queue.hbs | 4 ++-- app/templates/repo.hbs | 8 ++++---- app/templates/repos.hbs | 8 ++++---- app/templates/repos/list/tabs.hbs | 6 +++--- app/templates/repos/show/tabs.hbs | 20 +++++++++---------- app/templates/request.hbs | 4 ++-- app/templates/requests.hbs | 2 +- app/templates/running-jobs.hbs | 6 +++--- app/templates/settings/index.hbs | 2 +- app/templates/ssh-key.hbs | 2 +- app/templates/top.hbs | 16 ++++++++------- 34 files changed, 112 insertions(+), 110 deletions(-) diff --git a/app/templates/account.hbs b/app/templates/account.hbs index e77c6caf..3b56f897 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -4,16 +4,16 @@ {{#if config.billingEndpoint}}
    {{#if view.subscribed}} - + Subscription active! {{else}} {{#if view.education}} - + Educational account! {{else}} - + Sign up this account! {{/if}} @@ -93,9 +93,9 @@
      {{#each hook in hooksWithoutAdmin}} -
    • +
    • - + {{hook.slug}} {{hook.description}} diff --git a/app/templates/annotations/list.hbs b/app/templates/annotations/list.hbs index b0fe9f10..663f6303 100644 --- a/app/templates/annotations/list.hbs +++ b/app/templates/annotations/list.hbs @@ -2,7 +2,7 @@
      {{#each annotation in view.annotations}}
      - + {{annotation.status}} {{annotation.providerName}} : {{annotation.description}} diff --git a/app/templates/build.hbs b/app/templates/build.hbs index 9ced66cb..7e41a868 100644 --- a/app/templates/build.hbs +++ b/app/templates/build.hbs @@ -1,19 +1,19 @@ {{#if loading}} {{loading-indicator}} {{else}} -
      +
      - - + +

      {{#if build.pullRequest}} - Pull Request #{{build.pullRequestNumber}} + Pull Request #{{build.pullRequestNumber}} {{build.pullRequestTitle}} {{else}} - {{build.commit.branch}} + {{build.commit.branch}} {{format-message build.commit.subject repo=build.repo}} {{/if}}

      @@ -25,11 +25,11 @@
      {{#if commit.authorName}} - {{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}} + {{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}} {{/if}} {{#unless commit.authorIsCommitter}} {{#if commit.committerName}} - {{commit.committerName}} committed + {{commit.committerName}} committed {{/if}} {{/unless}}
      @@ -42,17 +42,17 @@ {{build.number}} {{humanize-state build.state}}{{/link-to}}
    • - + Commit {{format-sha commit.sha}}
    • {{#if build.pullRequest}} - #{{build.pullRequestNumber}}: {{build.pullRequestTitle}} + #{{build.pullRequestNumber}}: {{build.pullRequestTitle}} {{else}} {{#if build.commit.compareUrl}} - + Compare {{short-compare-shas build.commit.compareUrl}} {{/if}} diff --git a/app/templates/caches.hbs b/app/templates/caches.hbs index 64dc9753..5500cf20 100644 --- a/app/templates/caches.hbs +++ b/app/templates/caches.hbs @@ -1,7 +1,7 @@ {{#if cachesExist}}

      All caches (documentation)

      - + Delete all repository caches
      diff --git a/app/templates/components/builds-item.hbs b/app/templates/components/builds-item.hbs index 2cb686f1..ab40d847 100644 --- a/app/templates/components/builds-item.hbs +++ b/app/templates/components/builds-item.hbs @@ -17,7 +17,7 @@ {{/link-to}} {{/if}} -

      +

      {{build.commit.committerName}} committed

    diff --git a/app/templates/components/caches-item.hbs b/app/templates/components/caches-item.hbs index cdcfeb3e..eb77701f 100644 --- a/app/templates/components/caches-item.hbs +++ b/app/templates/components/caches-item.hbs @@ -1,5 +1,5 @@

    - + {{cache.branch}}

    @@ -8,7 +8,7 @@

    {{mb cache.size}}MB

    - + Delete

    diff --git a/app/templates/components/code-climate-popup.hbs b/app/templates/components/code-climate-popup.hbs index 2daf1003..2638f4bd 100644 --- a/app/templates/components/code-climate-popup.hbs +++ b/app/templates/components/code-climate-popup.hbs @@ -7,7 +7,7 @@

    Integrating Code Climate's test coverage reporting with your test suite on Travis CI allows to track changes in coverage over time. If you haven't tried it out already, sign + href={{config.codeClimateUrl}} target="_blank">sign up today to improve your code's quality. New customers get 20% off for the first three months!

    diff --git a/app/templates/components/hooks-list-item.hbs b/app/templates/components/hooks-list-item.hbs index dbf0bb1c..cc6eb0d6 100644 --- a/app/templates/components/hooks-list-item.hbs +++ b/app/templates/components/hooks-list-item.hbs @@ -6,7 +6,7 @@ {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}{{/link-to}} {{/if}}
    - + {{hook.slug}} {{hook.description}} @@ -16,7 +16,7 @@ An error happened when we tried to alter settings on GitHub. {{#if githubOrgsOauthAccessSettingsUrl}} It may be caused by API restrictions, please - review and add your authorized Orgs. diff --git a/app/templates/components/jobs-item.hbs b/app/templates/components/jobs-item.hbs index 14d98e6e..093678bd 100644 --- a/app/templates/components/jobs-item.hbs +++ b/app/templates/components/jobs-item.hbs @@ -1,6 +1,6 @@ {{#link-to "job" repo job}}
    - +

    @@ -8,8 +8,8 @@ {{job.number}}

    -

    - +

    +

    {{#if languages}} diff --git a/app/templates/components/owner-repo-tile.hbs b/app/templates/components/owner-repo-tile.hbs index cad544c6..83719f0f 100644 --- a/app/templates/components/owner-repo-tile.hbs +++ b/app/templates/components/owner-repo-tile.hbs @@ -2,7 +2,7 @@
    {{/if}}
    - +

    {{#link-to "repo" ownerName repoName }}{{repoName}}{{/link-to}}

    @@ -18,10 +18,10 @@

    - + {{repo.default_branch.name}}

    - {{format-sha repo.default_branch.last_build.commit.sha}}

    + {{format-sha repo.default_branch.last_build.commit.sha}}

    diff --git a/app/templates/components/travis-status.hbs b/app/templates/components/travis-status.hbs index a599939b..427d041e 100644 --- a/app/templates/components/travis-status.hbs +++ b/app/templates/components/travis-status.hbs @@ -1,7 +1,7 @@ {{#if statusPageStatusUrl}}

    Travis CI Status

    diff --git a/app/templates/dashboard/repositories.hbs b/app/templates/dashboard/repositories.hbs index 0fb099ea..c5ad82c8 100644 --- a/app/templates/dashboard/repositories.hbs +++ b/app/templates/dashboard/repositories.hbs @@ -19,12 +19,12 @@
    {{#each repo in filteredRepositories}} -
    +
    {{#if repo.private }}
    {{/if}}
    - +
    diff --git a/app/templates/env-vars.hbs b/app/templates/env-vars.hbs index 152ebe68..b4b585cb 100644 --- a/app/templates/env-vars.hbs +++ b/app/templates/env-vars.hbs @@ -8,11 +8,11 @@ {{partial 'env_vars/form'}} {{else}} Edit - + Delete {{name}} - {{value}} + {{value}} {{/if}} {{/unless}} diff --git a/app/templates/env-vars/_form.hbs b/app/templates/env-vars/_form.hbs index b63210a3..f7f25979 100644 --- a/app/templates/env-vars/_form.hbs +++ b/app/templates/env-vars/_form.hbs @@ -20,7 +20,7 @@
    - + or Cancel
    diff --git a/app/templates/home.hbs b/app/templates/home.hbs index e0f91286..002770c2 100644 --- a/app/templates/home.hbs +++ b/app/templates/home.hbs @@ -53,9 +53,9 @@
      {{#each repo in repos}} -
    • +
    • - +

      {{repo.owner}}

      diff --git a/app/templates/job.hbs b/app/templates/job.hbs index d1c83dea..b6238897 100644 --- a/app/templates/job.hbs +++ b/app/templates/job.hbs @@ -1,14 +1,14 @@ {{#if job.isLoaded}} -
      +
      - - + +

      - {{job.commit.branch}} + {{job.commit.branch}} {{format-message job.commit.subject repoBinding=job.repo}}

      @@ -16,11 +16,11 @@
      {{#if job.commit.authorName}} - {{job.commit.authorName}} authored{{#if job.commit.authorIsCommitter}} and committed{{/if}} + {{job.commit.authorName}} authored{{#if job.commit.authorIsCommitter}} and committed{{/if}} {{/if}} {{#unless job.commit.authorIsCommitter}} {{#if job.commit.committerName}} - {{job.commit.committerName}} committed + {{job.commit.committerName}} committed {{/if}} {{/unless}}
      @@ -35,14 +35,14 @@ {{/link-to}}
    • - Commit {{format-sha job.commit.sha}} + Commit {{format-sha job.commit.sha}}
    • {{#if job.build.pullRequest}} -
      #{{job.build.pullRequestNumber}}: {{job.build.pullRequestTitle}}
      +
      #{{job.build.pullRequestNumber}}: {{job.build.pullRequestTitle}}
      {{else}} {{#if job.build.commit.compareUrl}} -
      Compare {{short-compare-shas job.build.commit.compareUrl}}
      +
      Compare {{short-compare-shas job.build.commit.compareUrl}}
      {{/if}} {{/if}}
      • diff --git a/app/templates/jobs.hbs b/app/templates/jobs.hbs index 166d3252..568ccc59 100644 --- a/app/templates/jobs.hbs +++ b/app/templates/jobs.hbs @@ -1,5 +1,5 @@ {{#if view.jobs.length}} -
      +
      {{#if view.required}}

      Build Jobs

      @@ -14,12 +14,12 @@ {{#each job in view.jobs}} {{#view 'jobs-item' context=job}} -
      +
      {{#if job.config}} {{#link-to "job" job.repo job}}
      - +

      @@ -31,8 +31,8 @@ {{/if}}

      -

      - +

      + {{!-- {{config.os}} --}}

      @@ -47,7 +47,7 @@ no language set

      {{/if}} - +
      {{#if config.env}}

      @@ -61,14 +61,14 @@

      {{/if}} -

      +

      {{format-duration duration}}

      - {{!--

      + {{!--

      {{format-time finishedAt}}

      --}} diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs index ed83852d..eaccc851 100644 --- a/app/templates/jobs/pre.hbs +++ b/app/templates/jobs/pre.hbs @@ -18,12 +18,12 @@ {{/if}} -
      +
      {{#if view.canRemoveLog}} Remove Log {{/if}} - Download Log + Download Log
      {{#if view.showTailing}} @@ -49,7 +49,7 @@ {{#if view.limited}}

      This log is too long to be displayed. Please reduce the verbosity of your - build or download the raw log. + build or download the raw log.

      {{/if}}
      diff --git a/app/templates/layouts/home.hbs b/app/templates/layouts/home.hbs index cb1e693f..10517cdc 100644 --- a/app/templates/layouts/home.hbs +++ b/app/templates/layouts/home.hbs @@ -1,4 +1,4 @@ -
      +
      {{render "top"}} @@ -12,11 +12,11 @@
      -
    -
    +
    {{render "footer"}}
    diff --git a/app/templates/owner.hbs b/app/templates/owner.hbs index e46acc01..a5cc2479 100644 --- a/app/templates/owner.hbs +++ b/app/templates/owner.hbs @@ -1,10 +1,10 @@
    - +

    {{owner.name}}

    -

    {{owner.login}}

    +

    {{owner.login}}

    {{!-- {{owner-sync-button owner=owner}} --}}
    @@ -35,4 +35,4 @@
    --}}
    -
    \ No newline at end of file +
    diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs index 28e09f9e..3d465e92 100644 --- a/app/templates/profile/accounts.hbs +++ b/app/templates/profile/accounts.hbs @@ -2,7 +2,7 @@
    - +
    {{#link-to 'profile'}} @@ -19,7 +19,7 @@ {{#link-to "account" view.account class="name"}}
    - +

    {{view.name}}

    @@ -34,7 +34,7 @@ {{#if config.githubOrgsOauthAccessSettingsUrl}}

    Is an organization missing?
    - Review and add your authorized organizations.

    + Review and add your authorized organizations.

    {{/if}} diff --git a/app/templates/profile/tabs.hbs b/app/templates/profile/tabs.hbs index 38c2a174..f7e232be 100644 --- a/app/templates/profile/tabs.hbs +++ b/app/templates/profile/tabs.hbs @@ -1,11 +1,11 @@
      -
    • +
    • {{#link-to "account" account}}Repositories{{/link-to}}
      • {{#if view.displayUser}} -
    • +
    • {{#link-to "accounts.info"}}Profile{{/link-to}}
      @@ -14,7 +14,7 @@ {{#if config.billingEndpoint}}
    • - Billing + Billing
      • {{/if}} diff --git a/app/templates/profile/tabs/user.hbs b/app/templates/profile/tabs/user.hbs index 8579dff7..b10cf139 100644 --- a/app/templates/profile/tabs/user.hbs +++ b/app/templates/profile/tabs/user.hbs @@ -1,4 +1,4 @@ -{{!-- +{{!--
      @@ -6,7 +6,7 @@ GitHub
      - {{user.login}} + {{user.login}}
      @@ -26,4 +26,4 @@
      - --}} \ No newline at end of file + --}} diff --git a/app/templates/queue.hbs b/app/templates/queue.hbs index ea147397..a2d70ec2 100644 --- a/app/templates/queue.hbs +++ b/app/templates/queue.hbs @@ -1,9 +1,9 @@ {{#if isLoaded}} {{#if length}} {{#each job in controller}} -
      +
      {{#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 baa24ed0..59131043 100644 --- a/app/templates/repo.hbs +++ b/app/templates/repo.hbs @@ -1,17 +1,17 @@ -
      +
      {{#if view.isEmpty}} {{view 'repos-empty'}} {{else}} {{#if repo.isLoaded}} -
      +

      {{#link-to "repo" repo}}{{repo.slug}}{{/link-to}}

      - + - +

      {{description}}

      diff --git a/app/templates/repos.hbs b/app/templates/repos.hbs index f69e9684..7bf3f1d4 100644 --- a/app/templates/repos.hbs +++ b/app/templates/repos.hbs @@ -22,10 +22,10 @@ {{#collection 'repos-list' content=this}} {{#with view.repo as repo}} -
      +

      {{#if repo.slug}} - + {{#link-to "repo" repo class="slug"}}{{repo.slug}}{{/link-to}} {{/if}}

      @@ -44,7 +44,7 @@

      Duration: - + {{format-duration repo.lastBuildDuration}}

      @@ -52,7 +52,7 @@

      Finished: - + {{format-time repo.lastBuildFinishedAt}}

      diff --git a/app/templates/repos/list/tabs.hbs b/app/templates/repos/list/tabs.hbs index 7faf4ba2..fc8723a8 100644 --- a/app/templates/repos/list/tabs.hbs +++ b/app/templates/repos/list/tabs.hbs @@ -1,16 +1,16 @@
        -
      • +
      • My Repositories
        • {{#if config.pro}} -
      • +
      • Running ({{startedJobsCount}}/{{allJobsCount}})
        • {{/if}} -
      • +
      • {{#link-to "profile" trackEvent="add-repository-from-list" title="Add New Repository"}} {{/link-to}} diff --git a/app/templates/repos/show/tabs.hbs b/app/templates/repos/show/tabs.hbs index d771665a..e6cae01c 100644 --- a/app/templates/repos/show/tabs.hbs +++ b/app/templates/repos/show/tabs.hbs @@ -1,34 +1,34 @@
          -
        • +
        • {{#if repo.slug}} {{#link-to "repo" repo current-when="repo.index"}} Current {{/link-to}} {{/if}}
          • -
        • +
        • {{#if repo.slug}} {{#link-to "branches" repo}} Branches {{/link-to}} {{/if}}
          • -
        • +
        • {{#if repo.slug}} {{#link-to "builds" repo}} Build History {{/link-to}} {{/if}}
          • -
        • +
        • {{#if repo.slug}} {{#link-to "pullRequests" repo}} Pull Requests {{/link-to}} {{/if}}
          • -
        • +
        • {{#if build.id}} {{#if repo.slug}} {{#link-to "build" repo build}} @@ -37,7 +37,7 @@ {{/if}} {{/if}}
          • -
        • +
        • {{#if job.id}} {{#if repo.slug}} {{#link-to "job" repo job}} @@ -46,14 +46,14 @@ {{/if}} {{/if}}
          • -
        • +
        • {{#if repo.slug}} {{#link-to "settings" repo}} Settings {{/link-to}} {{/if}}
          • -
        • +
        • {{#if repo.slug}} {{#link-to "requests" repo}} Requests @@ -61,7 +61,7 @@ {{/if}}
          • {{#if config.caches_enabled}} -
        • +
        • {{#if repo.slug}} {{#link-to "caches" repo}} Caches @@ -70,7 +70,7 @@
          • {{/if}} -
        • +
        • {{#if request.id}} {{#if repo.slug}} {{#link-to "request" repo request}} diff --git a/app/templates/request.hbs b/app/templates/request.hbs index 0f556e01..71c922c6 100644 --- a/app/templates/request.hbs +++ b/app/templates/request.hbs @@ -1,10 +1,10 @@ -
          +

          {{status}}{{#unless isAccepted}}: {{message}}{{/unless}}

          {{#if isPullRequest}} This request is based on the - #{{pullRequestNumber}} + #{{pullRequestNumber}} pull request. {{else}} This request is based on a commit {{format-commit commit}} by {{commit.authorName}} diff --git a/app/templates/requests.hbs b/app/templates/requests.hbs index 14a0bce2..603b2220 100644 --- a/app/templates/requests.hbs +++ b/app/templates/requests.hbs @@ -1,7 +1,7 @@ {{#if config.pro}}

          Travis Lint for clean .yml files - lint.travis-ci.org/{{repo.slug}} + lint.travis-ci.org/{{repo.slug}}

          {{/if}} diff --git a/app/templates/running-jobs.hbs b/app/templates/running-jobs.hbs index f4bf43f7..a04e187b 100644 --- a/app/templates/running-jobs.hbs +++ b/app/templates/running-jobs.hbs @@ -1,9 +1,9 @@ {{#if isLoaded}} {{#if controller.length}} {{#each job in controller}} -
          +
          {{#if job.repo.slug}} - + {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}} {{/if}} @@ -17,7 +17,7 @@

          Duration: - + {{format-duration job.duration}}

          diff --git a/app/templates/settings/index.hbs b/app/templates/settings/index.hbs index eb576cb7..f373c693 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]+$/'}}

          - + Delete
          diff --git a/app/templates/top.hbs b/app/templates/top.hbs index fc6a6a93..4f82ad45 100644 --- a/app/templates/top.hbs +++ b/app/templates/top.hbs @@ -4,7 +4,7 @@
          -