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/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/styles/app.scss b/app/styles/app.scss index 75347017..f0f266bc 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/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 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/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/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 @@
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 55f94915..cc6eb0d6 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}} @@ -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/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.

  • 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 e60f99c4..eaccc851 100644 --- a/app/templates/jobs/pre.hbs +++ b/app/templates/jobs/pre.hbs @@ -4,12 +4,26 @@ {{#if view.job.notStarted}}
      Hang tight, the log cannot be shown until the build has started.
      {{/if}} -
      + +{{#if auth.signedIn}} + {{#if view.job.isLegacyInfrastructure}} + {{#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}} + + +
      {{#if view.canRemoveLog}} Remove Log {{/if}} - Download Log + Download Log
      {{#if view.showTailing}} @@ -30,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/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/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.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 93ee5043..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,3 +26,4 @@
      + --}} 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 a62e3c5c..2e7716b2 100644 --- a/app/templates/top.hbs +++ b/app/templates/top.hbs @@ -4,7 +4,7 @@
          -