Merge branch 'master' into booting-state

.jshintrc

@@ -2,7 +2,8 @@
   "predef": [
     "document",
     "window",
-    "-Promise"
+    "-Promise",
+    "jQuery"
   ],
   "browser": true,
   "boss": true,

Brocfile.js

@@ -1,54 +0,0 @@
-/* global require, module */
-
-var EmberApp = require('ember-cli/lib/broccoli/ember-app');
-
-var fingerprint,
-    assetsHost;
-
-if (process.env.DISABLE_FINGERPRINTS) {
-  fingerprint = false;
-} else {
-  fingerprint = {
-    extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg']
-  };
-
-  if (assetsHost = process.env.ASSETS_HOST) {
-    if (assetsHost.substr(-1) !== '/') {
-      assetsHost = assetsHost + '/'
-    }
-    fingerprint.prepend = assetsHost
-  }
-}
-
-var app = new EmberApp({
-  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');
-app.import('bower_components/jquery-timeago/jquery.timeago.js');
-app.import('bower_components/visibilityjs/lib/visibility.core.js');
-app.import('bower_components/visibilityjs/lib/visibility.timers.js');
-app.import('bower_components/JavaScript-MD5/js/md5.js');
-app.import('vendor/ansiparse.js');
-app.import('vendor/log.js');
-app.import('vendor/customerio.js');
-app.import('bower_components/moment/moment.js');
-// Use `app.import` to add additional libraries to the generated
-// output files.
-//
-// If you need to use different assets in different
-// environments, specify an object as the first parameter. That
-// object's keys should be the environment name and the values
-// should be the asset to use in that environment.
-//
-// If the library that you are including contains AMD or ES6
-// modules that you would like to import into your application
-// please specify an object with the list of modules as keys
-// along with the exports of each module as its value.
-
-module.exports = app.toTree();

app/components/add-env-var.coffee

@@ -0,0 +1,46 @@
+`import Ember from 'ember'`
+
+AddEnvVarComponent = Ember.Component.extend
+
+  classNames: ['form--envvar']
+  classNameBindings: ['nameIsBlank:form-error']
+
+  store: Ember.inject.service()
+
+  isValid: () ->
+    if Ember.isBlank(@get('name'))
+      this.set('nameIsBlank', true)
+      false
+    else
+      true
+
+  reset: ->
+    @setProperties(name: null, value: null, public: null)
+
+  actions:
+    save: ->
+      return if @get('isSaving')
+      @set('isSaving', true)
+
+      if @isValid()
+        env_var = @get('store').createRecord('env_var',
+          name: @get('name')
+          value: @get('value')
+          public: @get('public')
+          repo: @get('repo')
+        )
+
+        self = this
+        env_var.save().then =>
+          @set('isSaving', false)
+          @reset()
+        , =>
+          @set('isSaving', false)
+      else
+        @set('isSaving', false)
+
+    nameChanged: ->
+      this.set('nameIsBlank', false)
+
+
+`export default AddEnvVarComponent`

app/components/add-ssh-key.coffee

@@ -0,0 +1,73 @@
+# `import Ember from 'ember'`
+
+AddSshKeyComponent = Ember.Component.extend
+
+  classNames: ['form--sshkey']
+  classNameBindings: ['valueError:form-error']
+
+  store: Ember.inject.service()
+  isSaving: false
+
+  didInsertElement: () ->
+    id = @get('repo.id')
+    model = @get('store').recordForId('sshKey', id)
+    # TODO: this can be removed in favor of simply unloading record
+    # once https://github.com/emberjs/data/pull/2867
+    # and https://github.com/emberjs/data/pull/2870 are merged
+    if model
+      @get('store').dematerializeRecord(model)
+      typeMap = @get('store').typeMapFor('sshKey')
+      idToRecord = typeMap.idToRecord
+      delete idToRecord[id]
+
+    model = @get('store').createRecord('sshKey', id: id)
+    @set('model', model)
+
+  isValid: () ->
+    if Ember.isBlank(@get('value'))
+      this.set('valueError', 'Value can\'t be blank.')
+      false
+    else
+      true
+
+  reset: ->
+    @setProperties(description: null, value: null)
+
+  valueChanged: (->
+    this.set('valueError', false)
+  ).observes('value')
+
+  addErrorsFromResponse: (errArr) ->
+    error = errArr[0]
+    if error.code == 'not_a_private_key'
+      this.set('valueError', 'This key is not a private key.')
+    else if error.code == 'key_with_a_passphrase'
+      this.set('valueError', 'The key can\'t have a passphrase.')
+
+  actions:
+
+    save: ->
+      this.set('valueError', false)
+      return if @get('isSaving')
+      @set('isSaving', true)
+      if @isValid()
+
+        ssh_key = @get('model').setProperties(
+          description: @get('description')
+          value: @get('value')
+        )
+
+        ssh_key.save().then =>
+          @set('isSaving', false)
+          @reset()
+
+          @sendAction('sshKeyAdded', ssh_key)
+        , (error) =>
+          @set('isSaving', false)
+          if error.errors
+            @addErrorsFromResponse(error.errors)
+
+      else
+        @set('isSaving', false)
+
+`export default AddSshKeyComponent`

app/components/env-var.coffee

@@ -0,0 +1,29 @@
+`import Ember from 'ember'`
+
+EnvVarComponent = Ember.Component.extend
+
+  classNames: ['settings-envvar']
+  classNameBindings: ['envVar.public:is-public']
+
+  isDeleting: false
+
+  validates:
+    name: ['presence']
+
+  actionType: 'Save'
+  showValueField: Ember.computed.alias('public')
+
+  value: ( (key, value) ->
+    if @get('envVar.public')
+      @get('envVar.value')
+    else
+      '••••••••••••••••'
+  ).property('envVar.value', 'envVar.public')
+
+  actions:
+    delete: ->
+      return if @get('isDeleting')
+      @set('isDeleting', true)
+      @get('envVar').destroyRecord()
+
+`export default EnvVarComponent`

app/components/hook-switch.coffee

@@ -2,7 +2,7 @@
 
 HookSwitchComponent = Ember.Component.extend
   tagName: 'a'
-  classNames: ['travis-switch', 'switch']
+  classNames: ['switch--icon']
   classNameBindings: ['active']
   activeBinding: "hook.active"
 

app/components/limit-concurrent-builds.coffee

@@ -0,0 +1,40 @@
+`import Ember from 'ember'`
+
+LimitConcurrentBuildsComponent = Ember.Component.extend
+  
+  classNames: ['limit-concurrent-builds']
+
+  description: (->
+    description = "Limit concurrent jobs"
+    if @get('enabled')
+      description += "  "
+    description
+  ).property('enabled')
+
+
+  actions:
+    toggle: ->
+      unless @get('enabled')
+        return if @get('value') == 0
+        return if @get('isSaving')
+        @set('isSaving', true)
+
+        savingFinished = =>
+          @set('isSaving', false)
+
+        @get('repo').saveSettings(maximum_number_of_builds: 0).then(savingFinished, savingFinished)
+        @set('value', 0)
+
+    limitChanged: ->
+      repo = @get('repo')
+      limit = parseInt(@get('value'))
+      if limit
+        @set('isSaving', true)
+        savingFinished = =>
+          @set('isSaving', false)
+
+        repo.saveSettings(maximum_number_of_builds: limit).
+          then(savingFinished, savingFinished)
+
+
+`export default LimitConcurrentBuildsComponent`

app/components/loading-indicator.coffee

@@ -2,7 +2,7 @@
 
 LoadingIndicatorComponent = Ember.Component.extend
   tagName: 'div'
-  classNameBindings: ['center:loading-container']
+  classNameBindings: ['center:loading-container', 'inline:inline-block']
   center: false
 
 `export default LoadingIndicatorComponent`

app/components/settings-switch.coffee

@@ -0,0 +1,21 @@
+`import Ember from 'ember'`
+
+SettingsSwitchComponent = Ember.Component.extend
+
+  tagName: 'a'
+  classNames: ['switch']
+  classNameBindings: ['active']
+
+  click: ->
+    return if @get('isSaving')
+    @set('isSaving', true)
+    @toggleProperty('active')
+    setting = {}
+    setting[@get('key')] = @get('active')
+    @get('repo').saveSettings(setting).then =>
+      @set('isSaving', false)
+    , =>
+      @set('isSaving', false)
+      Travis.flash(error: 'There was an error while saving settings. Please try again.')
+
+`export default SettingsSwitchComponent`

app/components/ssh-key.coffee

@@ -0,0 +1,21 @@
+`import Ember from 'ember'`
+
+SshKeyComponent = Ember.Component.extend
+
+  classNames: ['settings-sshkey']
+
+  isDeleting: false
+
+  actions:
+    delete: ->
+      return if @get('isDeleting')
+      @set('isDeleting', true)
+
+      deletingDone = => @set('isDeleting', false)
+
+      @get('key').deleteRecord()
+      @get('key').save().then(deletingDone, deletingDone).then =>
+        @sendAction('sshKeyDeleted')
+
+
+`export default SshKeyComponent`

app/controllers/settings.coffee

@@ -0,0 +1,18 @@
+`import Ember from 'ember'`
+
+SettingsController = Ember.Controller.extend
+  envVars: Ember.computed.filterBy('model.envVars', 'isNew', false)
+
+  actions:
+    sshKeyAdded: (sshKey) ->
+      @set('model.customSshKey', sshKey)
+
+    sshKeyDeleted: ->
+      @set('model.customSshKey', null)
+
+    deactivate: ->
+      console.log('deactivate')
+      debugger
+    
+
+`export default SettingsController`

app/initializers/userlike.coffee

@@ -0,0 +1,13 @@
+`import config from 'travis/config/environment'`
+
+initialize = (container) ->
+
+
+  userlikeData = {}
+
+UserlikeInitializer =
+  name: 'userlike'
+  initialize: initialize
+
+`export {initialize}`
+`export default UserlikeInitializer`

app/models/ssh-key.coffee

@@ -5,5 +5,6 @@ SshKey = Model.extend
   value:       DS.attr()
   description: DS.attr()
   fingerprint: DS.attr()
+  isCustom: true
 
 `export default SshKey`

app/routes/settings.coffee

@@ -1,8 +1,54 @@
 `import TravisRoute from 'travis/routes/basic'`
+`import Ajax from 'travis/utils/ajax'`
+`import config from 'travis/config/environment'`
 
 Route = TravisRoute.extend
   needsAuth: true
   setupController: (controller, model) ->
+    @_super.apply(this, arguments)
+    controller.set('repo', @modelFor('repo'))
     @controllerFor('repo').activate('settings')
 
+    controller.set('concurrentBuildsLimit', !!model.settings.maximum_number_of_builds)
+
+  fetchEnvVars: () ->
+    repo = @modelFor('repo')
+    repo.get('envVars.promise')
+
+  fetchCustomSshKey: () ->
+    repo = @modelFor('repo')
+    self = this
+    @store.find('sshKey', repo.get('id')).then ( (result) -> result unless result.get('isNew') ), (xhr) ->
+      if xhr.status == 404
+        # if there is no model, just return null. I'm not sure if this is the
+        # best answer, maybe we should just redirect to different route, like
+        # ssh_key.new or ssh_key.no_key
+        return false
+
+  fetchSshKey: () ->
+    repo = @modelFor('repo')
+    Ajax.get "/repos/#{repo.get('id')}/key", (data) =>
+      Ember.Object.create(fingerprint: data.fingerprint)
+
+  fetchRepositoryActiveFlag: ->
+    repoId = @modelFor('repo').get('id')
+    apiEndpoint = config.apiEndpoint
+
+    $.ajax("#{apiEndpoint}/v3/repo/#{repoId}", {
+      headers: {
+        Authorization: 'token ' + @auth.token()
+      }
+    }).then( (response) ->
+      response.active
+    );
+
+  model: () ->
+    return Ember.RSVP.hash({
+      settings: @modelFor('repo').fetchSettings(),
+      envVars: this.fetchEnvVars(),
+      sshKey: this.fetchSshKey(),
+      customSshKey: this.fetchCustomSshKey(),
+      repositoryActive: this.fetchRepositoryActiveFlag()
+    });
+
 `export default Route`

app/routes/settings/index.coffee

@@ -1,11 +1,37 @@
 `import TravisRoute from 'travis/routes/basic'`
+`import config from 'travis/config/environment'`
 
 Route = TravisRoute.extend
   titleToken: 'Settings'
 
   model: ->
     repo = @modelFor('repo')
+
     repo.fetchSettings().then (settings) ->
+
+      console.log(settings)
       repo.set('settings', settings)
 
+    # return {
+
+    #   settings: (->
+    #     $.ajax('https://api.travis-ci.org/v3/repos/#{repo.id}/settings', {
+    #       headers: {
+    #         Authorization: 'token ' + @auth.token()
+    #       }
+    #     }).then (response) ->
+    #       console.log(response);
+    #       return response
+    #     )
+    #   env_vars: (->
+    #     $.ajax('/settings/env_vars?repository_id={repo.id}', {
+    #       headers: {
+    #         Authorization: 'token ' + @auth.token()
+    #       }
+    #     }).then (response) ->
+    #       console.log(response);
+    #       return response
+    #     )
+    # }
+
 `export default Route`

app/styles/app.scss

@@ -10,18 +10,19 @@
 @import "app/auth";
 @import "app/forms";
 @import "app/github";
+
 @import "app/main/annotations";
 @import "app/userlike";
 
 @import "app/main/list";
 @import "app/main/log";
-@import "app/main/sponsors";
+// @import "app/main/sponsors";
 @import "app/misc";
 @import "app/popup";
 // @import "app/pro";
-@import "app/settings";
+// @import "app/settings";
 
-@import "app/components/travis-switch";
+// @import "app/components/travis-switch";
 @import "app/components/sync-button";
 @import "app/components/loading-indicator";
 
@@ -40,8 +41,10 @@
 @import "app/modules/media";
 @import "app/modules/switch";
 @import "app/modules/memberlist";
+@import "app/modules/forms";
 @import "app/modules/notice";
 
+
 @import "app/layout";
 @import "app/layouts/dashboard";
 @import "app/layouts/error";
@@ -61,3 +64,5 @@
 @import "app/layouts/getting-started";
 @import "app/layouts/first-sync";
 @import "app/layouts/missing-notice";
+@import "app/layouts/settings";
+

app/styles/app/_mixins/vars.sass

@@ -2,10 +2,7 @@ $font-size-ml: 18px
 $font-size-m: 16px
 $font-size-sm: 14px
 $line-height-m: 1.3
-
-// colors
-$teal1: #5BA5A4
-$teal2: #63A4A3
+$font-size-s: 12px
 
 $blue-grey: #404650
 $blue-grey-light: #d8e2e6
@@ -34,7 +31,7 @@ $error-color: $fail-color
 $start-color: #D2C93B
 $start-bg-color: #D2CA24
 $cancel-color: #A1A0A0
-$dropdown-color: $teal1
+$dropdown-color: $teal-light
 $created-color: #CDBC2C
 
 $dashboard-text-color: #9d9fa1

app/styles/app/components/loading-indicator.sass

@@ -26,6 +26,8 @@
   text-align: center
   padding: 1.5em 1em
 
+.inline-block
+  display: inline-block
 
 .loading-indicator--white
   @extend .loading-indicator

app/styles/app/layouts/build-job.sass

@@ -71,7 +71,7 @@
       overflow: hidden
     .job-id
       width: grid-calc(3, 24)
-      border-right: solid 1px $grey-lighter
+      border-right: solid 1px $cream-dark
     .job-os
       width: grid-calc(1, 24)
       text-align: center

app/styles/app/layouts/owner.sass

@@ -112,7 +112,7 @@
   .active,
   .active:hover,
     position: relative
-    color: $teal2
+    color: $teal-dark
     &:after
       content: ""
       position: absolute
@@ -120,7 +120,7 @@
       bottom: -0.25em
       width: 100%
       height: 2px
-      background-color: $teal1
+      background-color: $teal-light
   .active
     font-weight: 600
 

app/styles/app/layouts/profile.sass

@@ -152,7 +152,6 @@ p.profile-user-last
     vertical-align: middle
   .profile-settings
     display: inline-block
-    margin-left: 1rem;
     padding: .2em .2em .2em .5em;
     height: 28px;
     vertical-align: bottom;

app/styles/app/layouts/settings.sass

@@ -0,0 +1,198 @@
+
+.small-title
+  font-size: 18px
+  color: $teal-light
+  font-weight: 400
+
+.settings
+  padding-top: .8em
+
+.settings-section
+  padding: 0 0 1em
+  margin-bottom: 3em
+  border-bottom: 2px solid #f2f3ef
+  &:last-of-type
+    border-bottom: none
+  .small-title
+    margin-top: 0
+
+  .switch
+    div
+      display: inline-block
+
+%settings-list
+  padding: 0
+  margin: 0
+  list-style: none
+  li
+    margin-bottom: 1rem
+
+.settings-list--columns
+  @extend %settings-list
+  li
+    @media #{$medium-up}
+      display: inline-block
+      width: grid-calc(11, 24)
+
+.settings-list--envvars
+  @extend %settings-list
+
+.settings-input
+  display: inline-block
+  margin-right: 1.4rem
+  vertical-align: middle
+  & + .label
+    vertical-align: middle
+  input
+    width: 80px
+    font-size: $font-size-s
+    text-align: center
+
+.limit-concurrent-builds
+  input
+    display: inline-block
+    width: 3em
+    height: 30px
+    margin: 0 .5em
+    text-align: center
+    box-shadow: none
+
+%settings-row
+  padding: .6em .5em
+  border-radius: 4px
+  background-color: #F6F5F5
+  @media #{$medium-up}
+    height: 47px
+
+.settings-envvar
+  @extend %settings-row
+
+.settings-sshkey
+  @extend %settings-row
+  display: block
+  margin-bottom: 1rem
+  overflow: hidden
+  span
+    vertical-align: middle
+  @media #{$medium-up}
+    overflow: visible
+
+%settings-name-section
+  display: inline-block
+  position: relative
+  vertical-align: middle
+  overflow: hidden
+  white-space: nowrap
+  &:after
+    content: ""
+    @include fadeOut(right, -90deg, #F6F5F5)
+
+.ssh-key-name
+  @extend %settings-name-section
+  width: 100%
+  margin-bottom: 1em
+  .icon-key
+    @extend %icon
+    @extend .icon-key
+    width: 1.2em
+    height: 1.3em
+
+  @media #{$medium-up}
+    width: 32%
+    margin-bottom: 0
+
+.env-var-name
+  @extend %settings-name-section
+  width: 100%
+  margin-bottom: 1em
+  @media #{$medium-up}
+    width: grid-calc(6, 12)
+    margin-bottom: 0
+
+
+%settings-value-section
+  display: inline-block
+  vertical-align: middle
+  overflow: hidden
+
+.ssh-key-value
+  @extend %settings-value-section
+  word-break: break-all
+  .icon-fingerprint
+    @extend %icon
+    @extend .icon-fingerprint
+    width: 1.3em
+    height: 1.3em
+    margin-right: .5em
+  @media #{$medium-up}
+    width: grid-calc(6, 12)
+    word-break: normal
+    white-space: nowrap
+
+.env-var-value
+  @extend %settings-value-section
+  white-space: nowrap
+  width: 76%
+  @media #{$medium-up}
+    width: grid-calc(3, 12)
+  input
+    display: inline-block
+    width: 100%
+    padding: 0.7em 0.5em 0.7em 2.6em
+    border-radius: 4px
+    border: none
+    background-color: #eeedec
+    color: #8e8f8e
+    @extend .icon-lock
+    background:
+      size: 14px
+      repeat: no-repeat
+      position: 0.8em 0.7em
+  .is-public &
+    input
+      background-image: none;
+      padding: 0.4em 0 0.5em 0.9em;
+      font-size: 14px;
+
+%settings-action-section
+  display: inline-block
+  position: relative
+  float: right
+  width: 24%
+  vertical-align: middle
+  text-align: center
+  .icon-delete
+    @extend %icon
+    @extend .icon-delete
+    width: 1.1em
+    height: 1.6em
+    background-position: 0 4px
+  &:hover
+    .icon-delete
+      @extend .icon-delete-hover
+  @media #{$medium-up}
+    width: grid-calc(4, 24)
+  @media #{$xlarge-up}
+    width: grid-calc(4, 36)
+
+.env-var-action
+  @extend %settings-action-section
+  a
+    padding: 1em
+
+.ssh-key-action
+  @extend %settings-action-section
+  margin-top: 1em
+  @media #{$medium-up}
+    margin-top: 0
+  .icon-delete
+    margin: .2em auto 0
+  .icon-delete-disabled
+    @extend %icon
+    @extend .icon-delete-disabled
+    display: block
+    width: 1.1em
+    height: 1.3em
+    margin: .2em auto 0
+
+

app/styles/app/layouts/sidebar.sass

@@ -77,7 +77,7 @@ $sb-font-size: 14px
   #tab_new
     a:hover
       .icon--plus:after
-        color: $teal1
+        color: $teal-light
       &:after
         bottom: -2px
 

app/styles/app/modules/buttons.sass

@@ -4,33 +4,28 @@
 
 $button-border-color: #d4d4d4
 
-.button
+.button,
+.btn
   font-family: $font-family-sans-serif
-  font-size: $font-size-tiny
-  font-weight: normal
   position: relative
   overflow: visible
   display: inline-block
   padding: 5px 10px
-  border: 1px solid $button-border-color
-  margin: 0
-  background-color: #E9E9E7
-  background-clip: padding-box
   cursor: pointer
   outline: none
   text-decoration: none
   text-align: center
-  color: $gray-dark-3
+  color: $white
   white-space: nowrap
   border-radius: 2px
+  background-color: $grey-lighter
 
 .button:hover,
 .button:focus,
 .button:active,
 .button.active
   border-color: $button-border-color
-  border-bottom-color: #2a65a0
-  background-color: #40454f
+  background-color: $grey-medium
   text-decoration: none
   color: #fff
 
@@ -85,9 +80,6 @@ $button-border-color: #d4d4d4
     position: relative
     top: -0.15em
 
-.btn
-  @extend .button
-  border-radius: 2px
 .button--green
   border: none
   font-size: $font-size-small

app/styles/app/modules/forms.sass

@@ -0,0 +1,79 @@
+
+%input-base
+  display: inline-block
+  width: 100%
+  padding: .4em .4em
+  border: 1px solid #eeedec
+  border-radius: 4px
+  color: #8e8f8e
+  font-size: $font-size-sm
+
+input[type="text"],
+input[type="email"],
+input[type="number"],
+input[type="password"]
+  @extend %input-base
+  height: 32px
+
+textarea
+  @extend %input-base
+
+
+.form-submit
+  display: inline-block
+  border: none
+  border-radius: 4px
+  padding: .5em .8em
+  color: $white
+  font-size: $font-size-sm
+  font-weight: 300
+  background-color: $grey-lighter
+  &:hover
+    background-color: #3BA85D
+    cursor: pointer
+
+
+.form--sshkey
+  .form-elem
+    margin-bottom: .5rem
+  @media #{$medium-up}
+    .form-elem
+      max-width: 460px
+
+
+.form--envvar
+  .form-elem
+    display: inline-block
+    vertical-align: top
+    width: 100%
+    margin-bottom: 1em
+  .switch
+    .label
+      font-size: $font-size-s
+      width: 7rem;
+      line-height: 1.2;
+
+  @media #{$medium-up}
+    .form-elem
+      margin-bottom: 0
+    .form-elem:first-of-type,
+    .form-elem:nth-of-type(2)
+      width: 31.5%
+      margin-right: 1em
+    .form-elem:nth-of-type(3)
+      width: 24%
+    .form-elem:last-of-type
+      width: 6%
+      float: right
+      text-align: right
+
+
+.form-error
+  .env-name,
+  .ssh-value
+    border: $fail-color 2px solid
+  .form-error-message
+    color: $fail-color
+    font-size: 14px
+    padding: .2em 0
+    margin: 0

app/styles/app/modules/icons.sass

@@ -165,11 +165,26 @@
 .icon--dismiss-grey
   background-image: inline-image('svg/dismiss.svg')
 
-.icon-hook-on
+%icon-hook-on
   background-image: inline-image('svg/hooks-on.svg')
-.icon-hook-off
+%icon-hook-off
   background-image: inline-image('svg/hooks-off.svg')
 
+.icon-delete
+  background-image: inline-image('svg/delete.svg')
+  
+.icon-delete-hover
+  background-image: inline-image('svg/delete-hover.svg')
+
+.icon-delete-disabled
+  background-image: inline-image('svg/delete-disabled.svg')
+
+.icon-key
+  background-image: inline-image('svg/key.svg')
+
+.icon-fingerprint
+  background-image: inline-image('svg/fingerprint.svg')
+
 .icon--plus
   &:after
     content: "+"

app/styles/app/modules/switch.sass

@@ -1,55 +1,85 @@
 
-.profile-switch
-  $switch-height: 28px
-  $switch-inner-height: 22px
-  $switch-width: 62px
-  $switch-inner-width: 27px
+%switch
+  $switch-height: 32px
+  $switch-width: 80px
 
-  span
-    display: none
+  $switch-inner-width: 36px
+  $switch-inner-heigth: 26px
 
-  .switch
-    box-sizing: border-box
-    position: relative
+  .switch-inner
+    display: inline-block
     width: $switch-width
     height: $switch-height
-    background-color: #d1d1d1
+    margin-right: 1em
+    padding: 3px 3px 3px 4px
+    vertical-align: middle
+    overflow: visible
+    background-color: #E2E1E2
+    border-radius: 4px
     border: none
     cursor: pointer
-    @extend %border-radius-4px
-    &:before
-      content: none
-    &:after
-      content: ""
-      display: block
-      position: absolute
-      top: ($switch-height - $switch-inner-height) / 2
-      right: ($switch-width - ($switch-inner-width * 2)) / 2
-      height: $switch-inner-height
+    span
       width: $switch-inner-width
-      background-color: #919191
-      background-repeat: no-repeat
-      background-size: 14px 14px
-      background-position: 6px
-      transition: right 200ms ease
-      @extend .icon-hook-off
-      @extend %border-radius-4px
+      height: $switch-inner-heigth
+      border-radius: 4px
+      background-color: #A5A4A4
+      color: $white
+      text-align: center
+      font-weight: 300
+      font-size: 12px
+      line-height: 2.2
 
-    &.active
-      background-color: #b6d5b6
-      &:after
-        right: $switch-width - $switch-inner-width - (($switch-width - ($switch-inner-width * 2)) / 2)
-        background-color: #39a85b
-        @extend .icon-hook-on
+  span
+    display: inline-block
+    vertical-align: middle
+  
+  .label
+    vertical-align: middle
+    font-size: $font-size-m
+    color: $grey-medium
+    display: inline-block
+  &.label--small .label
+    width: 7em
+    font-size: 12px
+    line-height: 1.3
 
-    &.disabled
-      cursor: default
-      pointer-events: none
-      opacity: .5
+  .on
+    display: none
+    margin-left: 0
+  .off
+    margin-left: 36px
 
-    .active &.disabled
-      background-color: #b6d5b6
-      &:after
-        right: $switch-width - $switch-inner-width - (($switch-width - ($switch-inner-width * 2)) / 2)
-        background-color: #39a85b
-        @extend .icon-hook-on
+  &.active
+    .switch-inner
+      background-color: #B8D6B9
+      span
+        background-color: #3BA85D
+    .on
+      display: inline-block
+    .off
+      display: none
+
+  &.disabled
+    cursor: default
+    pointer-events: none
+    opacity: .5
+
+
+.switch
+  @extend %switch
+
+.switch--icon
+  @extend %switch
+
+  .on,
+  .off
+    text-indent: 99%;
+    overflow: hidden;
+    white-space: nowrap;
+    background-size: 1.1em
+    background-position: 50%
+    background-repeat: no-repeat
+  .off
+    @extend %icon-hook-off
+  .on
+    @extend %icon-hook-on

app/styles/app/modules/tabs.sass

@@ -20,7 +20,7 @@
   .active a,
   a:hover
     position: relative
-    color: $teal2
+    color: $teal-dark
     &:after
       content: ""
       position: absolute
@@ -28,7 +28,7 @@
       bottom: -0.25em
       width: 100%
       height: 2px
-      background-color: $teal2
+      background-color: $teal-dark
   .active a
     font-weight: 600
 
@@ -68,7 +68,7 @@
       color: $grey-light
       padding: .5em 0
     .active
-      color: $teal2
+      color: $teal-dark
 
     @media #{$medium-up}
       border-bottom: solid $cream-dark 2px

app/styles/app/modules/tooltips.sass

@@ -1,42 +1,85 @@
+%tooltip
+  &:hover .tooltip-bubble
+    transform: translateY(0)
+    opacity: 1
 
-$tooltip-grey: #6A6C6D
+  .tooltip-bubble
+    position: absolute
+    top: -2.8em
+    width: auto
+    height: 1.9em
+    margin: auto
+    padding: .3em .4em .3em
+    z-index: 5
+    background-color: #818383
+    border-radius: 4px
+    color: $white
+    font-size: $font-size-sm
+    line-height: 1.3
+    text-align: center
+    white-space: nowrap
+
+    transition: all 100ms ease
+    transform: translateY(20%)
+    opacity: 0
+
+    a
+      color: $white
+      &:hover
+        text-decoration: underline
+
+    &:before
+      content: ""
+      position: absolute
+      bottom: -0.3em
+      width: 1em
+      height: 1em
+      transform: rotate(45deg)
+      z-index: -1
+      background-color: #818383
 
 .tooltip
+  @extend %tooltip
+  .tooltip-bubble
+    right: 0
+    left: 0
+    max-width: 5em
+    &:before
+      left: 40%
+
+.tooltip--height
+  @extend %tooltip
+  .tooltip-bubble
+    right: 0
+    left: 0
+    top: -4em
+    height: 3.2em
+    max-width: 8.6em
+    &:before
+      left: 45%
+
+.tooltip--jobs
+  @extend %tooltip
+  display: inline-block
   position: relative
-  display: none
+  .tooltip-bubble
+    top: -4.5em
+    left: -1.9em
+    height: 3.7em
+    &:before
+      left: 15%
 
-.tooltip-inner
-  position: absolute
-  bottom: 0
-  right: 0
-  background: $tooltip-grey
-  color: $white
-  font-size: $font-size-small
-  line-height: 18px
-  text-align: center
-  padding: 8px 5px
-  @extend %border-radius-4px
-  
-  &:after
-    content: ''
-    position: absolute
-    top: 98%
-    right: 3em
-    width: 0
-    height: 0
-    border-top: 13px solid $tooltip-grey
-    border-right: 13px solid transparent
-    border-left: 13px solid transparent
-
-  @media #{$small-only}
-    bottom: -2.5em  
-
-  @media #{$medium-up}
-    width: 18rem
-
-.tooltip-inner
-  height: 4.1em
-  top: -8em
-  left: 4em
-  &:after
-    left: 3.7em
+.tooltip--settings
+  @extend %tooltip
+  display: inline-block
+  position: relative
+  .icon
+    width: 1.2em
+    height: 1.2em
+    vertical-align: middle
+  .tooltip-bubble
+    top: -4em
+    left: -1.9em
+    height: 3.2em
+    &:before
+      left: 2em

app/styles/app/userlike.sass

@@ -2,7 +2,7 @@
 .feedback-button
   display: none
   position: fixed
-  right: 1%
+  right: 4%
   left: auto
   bottom: 0
   margin: 0

app/templates/account.hbs

@@ -22,7 +22,7 @@
   {{/if}}
 
     <div class="profile-header">
-      <h1>{{view.name}}</h1>
+      <h1>{{user.name}}</h1>
     </div>
 
     {{#if user.isSyncing}}
@@ -94,7 +94,16 @@
       <ul class="profile-hooklist">
         {{#each hook in hooksWithoutAdmin}}
           <li class="{{if hook.active 'active'}} row">
-            <button class="profile-switch disabled"></button>
+            <div class="switch--icon inline-block disabled {{if hook.active 'active'}}">
+              <div class="switch-inner">
+                <span class="on">
+                  ON
+                </span>
+                <span class="off">
+                  OFF
+                </span>
+              </div>
+            </div>
             <a href={{hook.urlGithub}} rel="nofollow" class="profile-repo">
               {{hook.slug}}
               <span>{{hook.description}}</span>

app/templates/components/add-env-var.hbs

@@ -0,0 +1,21 @@
+<form {{action "save" on="submit"}}>
+  <div class="form-elem">
+    {{input value=name class="env-name" on="key-up" action="nameChanged" placeholder="Name"}}
+    {{#if nameIsBlank }}
+      <p class="form-error-message">Name cannot be blank</p>
+    {{/if}}
+  </div>
+  <div class="form-elem">
+    {{input value=value class="env-value" placeholder="Value"}}
+  </div>
+  <div class="form-elem">
+    {{travis-switch active=public description="Display value in build log"}}
+  </div>
+  <div class="form-elem">
+    {{#if isSaving}}
+      {{loading-indicator}}
+    {{else}}
+      <input type="submit" value="Add" class="form-submit" />
+    {{/if}}
+  </div>
+</form>

app/templates/components/add-ssh-key.hbs

@@ -0,0 +1,18 @@
+<form {{action "save" on="submit"}}>
+  <div class="form-elem">
+    {{input value=description class="ssh-description" placeholder="Description"}}
+  </div>
+  <div class="form-elem">
+    {{textarea value=value class="ssh-value" rows="10" placeholder="SSH Key"}}
+    {{#if valueError}}
+      <p class="form-error-message">{{valueError}}</p>
+    {{/if}}
+  </div>
+  <div class="form-elem">
+    {{#if isSaving}}
+      {{loading-indicator}}
+    {{else}}
+      <input type="submit" value="Add" class="form-submit" />
+    {{/if}}
+  </div>
+</form>

app/templates/components/env-var.hbs

@@ -0,0 +1,17 @@
+
+<div class="env-var-name">{{envVar.name}}</div>
+<div class="env-var-value">
+  <input type="pw" value="{{value}}" readonly="readonly">
+</div>
+<div class="env-var-action">
+  <div class="tooltip">
+    {{#if isDeleting}}
+      {{loading-indicator}}
+    {{else}}
+      <a href="#" title="" {{action "delete" on="click"}}>
+        <span class="icon-delete"></span>
+      </a>
+      <div class="tooltip-bubble">Delete</div>
+    {{/if}}
+  </div>
+</div>

app/templates/components/hook-switch.hbs

@@ -1,6 +1,9 @@
-<span class="on">
-  ON
-</span>
-<span class="off">
-  OFF
-</span>
+<div class="switch-inner">
+  <span class="on">
+    ON
+  </span>
+  <span class="off">
+    OFF
+  </span>
+</div>
+

app/templates/components/jobs-list.hbs

@@ -5,9 +5,9 @@
     <h2 class="build-title">Build Jobs</h2>
   {{else}}
     <h2 class="build-title">Allowed Failures
-      <span class="icon icon--question"></span>
-      <div class="tooltip">
-        <p class="tooltip-inner">These are jobs you can allow to fail without failing your entire build</p>
+      <div class="tooltip--jobs">
+        <span class="icon icon--question"></span>
+        <p class="tooltip-bubble">These are jobs you can allow to fail <br> without failing your entire build</p>
       </div>
     </h2>
   {{/if}}

app/templates/components/limit-concurrent-builds.hbs

@@ -0,0 +1,13 @@
+{{travis-switch active=enabled description=description action="toggle"}}
+<div class="tooltip--settings">
+  <a href="http://blog.travis-ci.com/2014-07-18-per-repository-concurrency-setting/" title="about the concurrency setting">
+    <p class="tooltip-bubble">Read more about<br>concurrent builds</p>
+    <span class="icon icon--question"></span>
+  </a>
+</div>
+{{#if enabled}}
+  {{input pattern="/^[0-9]+$/" value=value on="key-up" action="limitChanged"}}
+{{/if}}
+{{#if isSaving}}
+{{loading-indicator inline=true}}
+{{/if}}

app/templates/components/settings-switch.hbs

@@ -0,0 +1,12 @@
+<div class="switch-inner">
+  <span class="on">
+    ON
+  </span>
+  <span class="off">
+    OFF
+  </span>
+</div>
+<span class="label">{{description}}</span>
+{{#if isSaving}}
+  {{loading-indicator}}
+{{/if}}

app/templates/components/ssh-key.hbs

@@ -0,0 +1,37 @@
+{{#if key.isCustom}}
+  <div class="ssh-key-name">
+    <span class="icon-key"></span>
+    <span>{{key.description}}</span>
+  </div>
+  <div class="ssh-key-value">
+    <span class="icon-fingerprint"></span>
+    <span>{{key.fingerprint}}</span>
+  </div>
+  <div class="ssh-key-action">
+    {{#if isDeleting}}
+      {{loading-indicator}}
+    {{else}}
+      <div class="tooltip">
+        <a href="#" title="" {{action "delete"}}>
+          <span class="icon-delete"></span>
+        </a>
+        <div class="tooltip-bubble">Delete</div>
+      </div>
+    {{/if}}
+  </div>
+{{else}}
+  <div class="ssh-key-name">
+    <span class="icon-key"></span>
+    <span>no custom key set</span>
+  </div>
+  <div class="ssh-key-value">
+    <span class="icon-fingerprint"></span>
+    <span>{{key.fingerprint}}</span>
+  </div>
+  <div class="ssh-key-action">
+    <div class="tooltip--height">
+      <span class="icon-delete-disabled"></span>
+      <div class="tooltip-bubble">Default keys <br>cannot be deleted</div>
+    </div>
+  </div>
+{{/if}}

app/templates/components/travis-switch.hbs

@@ -1,7 +1,9 @@
-
-<span class="on">
-  ON
-</span>
-<span class="off">
-  OFF
-</span>
+<div class="switch-inner">
+  <span class="on">
+    ON
+  </span>
+  <span class="off">
+    OFF
+  </span>
+</div>
+<span class="label">{{description}}</span>

app/templates/jobs.hbs

@@ -5,9 +5,9 @@
     <h2 class="build-title">Build Jobs</h2>
   {{else}}
     <h2 class="build-title">Allowed Failures
-      <span class="icon icon--question"></span>
-      <div class="tooltip">
-        <p class="tooltip-inner">These are jobs are allowed to fail, without failing your entire build.</p>
+      <div class="tooltip--jobs">
+        <span class="icon icon--question"></span>
+        <p class="tooltip-bubble">These are jobs are allowed to fail, without failing your entire build.</p>
       </div>
     </h2>
   {{/if}}

app/templates/jobs/pre.hbs

@@ -1,22 +1,22 @@
 {{remove-log-popup job=view.job}}
 
 <section id="log-container" class="log">
+
+  {{#if auth.signedIn}}
+    {{#if view.job.isLegacyInfrastructure}}
+      {{#if view.job.isFinished}}
+        <p class="notice"><span class="icon-flag"></span>
+        This job ran on our legacy infrastructure. Please read <a href="http://docs.travis-ci.com/user/migrating-from-legacy/?utm_source=legacy-notice&utm_medium=banner&utm_campaign=legacy-upgrade" title="Migrating from legacy">our docs on how to upgrade</a></p>
+      {{else}}
+        <p class="notice"><span class="icon-flag"></span>
+        This job is running on our legacy infrastructure. Please read <a href="http://docs.travis-ci.com/user/migrating-from-legacy/?utm_source=legacy-notice&utm_medium=banner&utm_campaign=legacy-upgrade" title="Migrating from legacy">our docs on how to upgrade</a></p>
+      {{/if}}
+    {{/if}}
+  {{/if}}
+
   {{#if view.job.notStarted}}
     <div class="log-notice">Hang tight, the log cannot be shown until the build has started.</div>
   {{/if}}
-  
-{{#if auth.signedIn}}
-  {{#if view.job.isLegacyInfrastructure}}
-    {{#if view.job.isFinished}}
-      <p class="notice"><span class="icon-flag"></span>
-      This job ran on our legacy infrastructure. Please read <a href="http://docs.travis-ci.com/user/migrating-from-legacy/?utm_source=legacy-notice&utm_medium=banner&utm_campaign=legacy-upgrade" title="Migrating from legacy">our docs on how to upgrade</a></p>
-    {{else}}
-      <p class="notice"><span class="icon-flag"></span>
-      This job is running on our legacy infrastructure. Please read <a href="http://docs.travis-ci.com/user/migrating-from-legacy/?utm_source=legacy-notice&utm_medium=banner&utm_campaign=legacy-upgrade" title="Migrating from legacy">our docs on how to upgrade</a></p>
-    {{/if}}
-  {{/if}}
-{{/if}}
-
 
   <div class="{{if view.job.notStarted 'hidden'}}">
     <menu class="log-header">

app/templates/profile.hbs

@@ -1 +1,3 @@
-{{outlet}}
+<article class="profile-main">
+  {{outlet}}
+</article>

app/templates/profile/show.hbs

@@ -1,3 +1,4 @@
-<article class="profile-main">
+{{!-- <article class="profile-main">
   {{outlet}}
 </article>
+ --}}

app/templates/settings.hbs

@@ -1,12 +1,47 @@
-<ul class="navigation tabnav-sub">
-  <li>{{#link-to "settings.index"}}General Settings{{/link-to}}</li>
-  <li>{{#link-to "env_vars"}}Environment Variables{{/link-to}}</li>
+<div class="settings">
 
-  {{#if config.endpoints.sshKey}}
-    <li>{{#link-to "ssh_key"}}SSH Key{{/link-to}}</li>
-  {{/if}}
-</ul>
+  <section class="settings-section">
+    <h2 class="small-title">General Settings</h2>
+
+    <ul class="settings-list--columns">
+      <li>{{settings-switch active=model.settings.builds_only_with_travis_yml repo=repo description="Build only if .travis.yml is present" key="builds_only_with_travis_yml"}}</li>
+      <li>{{settings-switch active=model.settings.build_pushes repo=repo description="Build pushes" key="build_pushes"}}</li>
+      <li>{{limit-concurrent-builds value=model.settings.maximum_number_of_builds enabled=concurrentBuildsLimit repo=repo}}</li>
+      <li>{{settings-switch active=model.settings.build_pull_requests repo=repo description="Build pull requests" key="build_pull_requests"}}</li>
+    </ul>
+
+  </section>
+
+  <section class="settings-section">
+    <h2 class="small-title">Environment Variables</h2>
+
+    <ul class="settings-list--envvars">
+      {{#each envVars as |envVar|}}
+        <li>{{env-var envVar=envVar}}</li>
+      {{/each}}
+    </ul>
+
+    {{add-env-var repo=repo}}
+
+
+  </section>
+{{#if config.endpoints.sshKey}}
+  <section class="settings-section">
+    <h2 class="small-title">SSH Key</h2>
+
+    {{#if model.customSshKey}}
+      {{ssh-key key=model.customSshKey sshKeyDeleted="sshKeyDeleted"}}
+    {{else}}
+      {{ssh-key key=model.sshKey}}
+      {{add-ssh-key repo=repo sshKeyAdded="sshKeyAdded"}}
+    {{/if}}
+
+  </section>
+{{/if}}
+ {{!--  <section class="settings-section">
+    <h2 class="small-title">Deactivate Repository</h2>
+    <p>If you'd no longer like to run this project on Travis CI you can deactivate it now.<br>You will be able to reactivate it in the future if you'd like to.</p>
+    <a href="#" class="button--delete" {{action "deactivate"}}>Deactivate Repository</a>
+  </section> --}}
 
-<div id="settings">
-  {{outlet}}
 </div>

app/utils/helpers.coffee

@@ -2,6 +2,7 @@
 `import { githubCommit as githubCommitUrl } from 'travis/utils/urls'`
 `import configKeysMap from 'travis/utils/keys-map'`
 `import config from 'travis/config/environment'`
+`import Ember from 'ember'`
 
 timeago = $.timeago
 mapObject = $.map
@@ -66,9 +67,9 @@ formatMessage = (message, options) ->
   message = message || ''
   message = message.split(/\n/)[0]  if options.short
   message = _emojize(_escape(message))
-  if !!options.repo
-    message = githubify(message, options.repo.get('owner'), options.repo.get('name'))
-  if !!options.pre
+  if options.repo
+    message = githubify(message, Ember.get(options.repo, 'owner'), Ember.get(options.repo, 'name'))
+  if options.pre
     message = message.replace /\n/g, '<br/>'
   message
 

bower.json

@@ -3,14 +3,14 @@
   "dependencies": {
     "handlebars": "2.0.0",
     "jquery": "^1.11.1",
-    "ember": "1.11.3",
+    "ember": "1.13.3",
     "ember-data": "1.0.0-beta.16.1",
     "ember-resolver": "~0.1.15",
     "loader.js": "ember-cli/loader.js#1.0.1",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.0",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.1",
+    "ember-qunit": "0.4.0",
     "ember-qunit-notifications": "0.0.5",
     "qunit": "~1.17.1",
     "visibilityjs": "~1.2.1",

ember-cli-build.js

@@ -0,0 +1,43 @@
+/* global require, module */
+var EmberApp = require('ember-cli/lib/broccoli/ember-app');
+
+module.exports = function(defaults) {
+  var fingerprint,
+      assetsHost;
+
+  if (process.env.DISABLE_FINGERPRINTS) {
+    fingerprint = false;
+  } else {
+    fingerprint = {
+      extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg']
+    };
+
+    if (assetsHost = process.env.ASSETS_HOST) {
+      if (assetsHost.substr(-1) !== '/') {
+        assetsHost = assetsHost + '/'
+      }
+      fingerprint.prepend = assetsHost
+    }
+  }
+
+  var app = new EmberApp({
+    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');
+  app.import('bower_components/jquery-timeago/jquery.timeago.js');
+  app.import('bower_components/visibilityjs/lib/visibility.core.js');
+  app.import('bower_components/visibilityjs/lib/visibility.timers.js');
+  app.import('bower_components/JavaScript-MD5/js/md5.js');
+  app.import('vendor/ansiparse.js');
+  app.import('vendor/log.js');
+  app.import('vendor/customerio.js');
+  app.import('bower_components/moment/moment.js');
+
+  return app.toTree();
+};

package.json

@@ -21,23 +21,25 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
     "broccoli-sass": "0.6.5",
-    "ember-cli": "^0.2.3",
-    "ember-cli-app-version": "0.3.3",
+    "ember-cli": "^1.13.1",
+    "ember-cli-app-version": "0.4.0",
     "ember-cli-autoprefixer": "^0.3.0",
     "ember-cli-babel": "5.0.0",
     "ember-cli-coffeescript": "0.10.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "0.0.8",
     "ember-cli-document-title": "0.1.0",
-    "ember-cli-htmlbars": "0.7.4",
-    "ember-cli-ic-ajax": "0.1.1",
+    "ember-cli-htmlbars": "0.7.9",
+    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
+    "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-inline-images": "^0.0.4",
     "ember-cli-pretender": "0.3.1",
-    "ember-cli-qunit": "0.3.10",
+    "ember-cli-qunit": "0.3.15",
+    "ember-cli-release": "0.2.3",
     "ember-cli-sauce": "^1.1.0",
     "ember-cli-uglify": "1.0.1",
-    "ember-data": "1.0.0-beta.16.1",
+    "ember-data": "1.13.5",
     "ember-export-application-global": "^1.0.2",
     "ember-try": "0.0.7"
   }

public/images/svg/delete-disabled.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 13.2 16.3" enable-background="new 0 0 13.2 16.3" xml:space="preserve">
+<g>
+	<polygon fill="#DFE0E1" points="1.3,4.6 2.4,11.8 9.1,4.6 	"/>
+	<path fill="#DFE0E1" d="M3.2,15.4c0.3,0.4,0.8,0.9,1.7,0.9c1,0,3.7,0,4.7,0c1.9,0,2.1-1.9,2.1-1.9l1.6-9.7h0L3.2,15.4z"/>
+	<path fill="#DFE0E1" d="M9,0.9C8.9-0.1,8,0,8,0H6.4c0,0-0.9-0.1-1,0.9H1.9c0,0-0.8-0.1-1.3,0.7c-0.5,0.9-1.1,1.5,0,1.5
+		c0.5,0,6,0,9.8,0l2.1-2.2H9z"/>
+</g>
+</svg>

public/images/svg/delete-hover.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 14.5 16" enable-background="new 0 0 14.5 16" xml:space="preserve">
+<g>
+	<path fill="#EA3D3D" d="M1.3,4.6l1.6,9.7c0,0,0.1,1.9,2.1,1.9c1,0,3.7,0,4.7,0c1.9,0,2.1-1.9,2.1-1.9l1.6-9.7H1.3z"/>
+	<path fill="#EA3D3D" d="M13.8,1.6c-0.5-0.8-1.3-0.7-1.3-0.7H9C8.9-0.1,8,0,8,0H6.4c0,0-0.9-0.1-1,0.9H1.9c0,0-0.8-0.1-1.3,0.7
+		c-0.5,0.9-1.1,1.5,0,1.5c0.8,0,12.5,0,13.2,0C14.9,3.1,14.3,2.5,13.8,1.6z"/>
+</g>
+</svg>

public/images/svg/delete.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 14.5 16" enable-background="new 0 0 14.5 16" xml:space="preserve">
+<g>
+	<path fill="#C2C3C5" d="M1.3,4.5l1.6,9.6c0,0,0.1,1.9,2.1,1.9c1,0,3.7,0,4.7,0c1.9,0,2.1-1.9,2.1-1.9l1.6-9.6H1.3z"/>
+	<path fill="#C2C3C5" d="M13.8,1.6c-0.5-0.8-1.3-0.7-1.3-0.7H9C8.9-0.1,8,0,8,0H6.4c0,0-0.9-0.1-1,0.9H1.9c0,0-0.8-0.1-1.3,0.7
+		c-0.5,0.9-1.1,1.5,0,1.5c0.8,0,12.5,0,13.2,0C14.9,3.1,14.3,2.5,13.8,1.6z"/>
+</g>
+</svg>

public/images/svg/fingerprint.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<g>
+				<path fill="#ADADAD" d="M0.4,9.8c-0.1,0-0.2-0.1-0.2-0.2C-0.7,5.3,2.1,1,6.4,0.2c4.3-0.9,8.6,1.9,9.4,6.3c0,0.1-0.1,0.2-0.2,0.3
+					c-0.1,0-0.2-0.1-0.3-0.2c-0.8-4.1-4.8-6.7-8.9-5.9C2.4,1.4-0.2,5.4,0.6,9.5C0.6,9.6,0.6,9.7,0.4,9.8C0.4,9.8,0.4,9.8,0.4,9.8z"
+					/>
+			</g>
+		</g>
+	</g>
+	<g>
+		<g>
+			<g>
+				<path fill="#ADADAD" d="M15.8,8.4C15.8,8.4,15.8,8.4,15.8,8.4c-0.1,0-0.2-0.1-0.2-0.2c0-0.5,0-1.1-0.1-1.6
+					c0-0.1,0.1-0.2,0.2-0.3c0.1,0,0.2,0.1,0.3,0.2C16,7,16,7.6,16,8.2C16,8.3,15.9,8.4,15.8,8.4z"/>
+			</g>
+			<g>
+				<path fill="#ADADAD" d="M0.5,10.1c-0.1,0-0.2-0.1-0.2-0.2c0-0.1-0.1-0.2-0.1-0.3c0-0.1,0.1-0.2,0.2-0.3c0.1,0,0.2,0.1,0.3,0.2
+					c0,0.1,0,0.2,0.1,0.3C0.7,9.9,0.6,10.1,0.5,10.1C0.5,10.1,0.5,10.1,0.5,10.1z"/>
+			</g>
+		</g>
+	</g>
+	<g>
+		<path fill="#ADADAD" d="M6,15.7c-0.1,0-0.1,0-0.2-0.1c-0.1-0.1-0.1-0.2,0-0.3c1.8-2,2.5-4.7,2-7.3c0-0.1,0.1-0.2,0.2-0.3
+			c0.1,0,0.2,0.1,0.3,0.2c0.6,2.8-0.2,5.6-2.1,7.7C6.1,15.7,6.1,15.7,6,15.7z"/>
+	</g>
+	<g>
+		<path fill="#ADADAD" d="M8.3,16c0,0-0.1,0-0.1,0C8,15.9,8,15.7,8.1,15.6c1.6-2.4,2.2-5.2,1.6-8l0-0.1C9.6,7.2,9.3,6.8,9,6.6
+			C8.6,6.3,8.1,6.2,7.7,6.3C7.2,6.4,6.8,6.7,6.6,7.1C6.3,7.4,6.3,7.8,6.3,8.2l0,0.1c0.5,2.4-0.3,4.9-2.1,6.5C4.1,15,4,15,3.9,14.9
+			c-0.1-0.1-0.1-0.2,0-0.3c1.6-1.5,2.4-3.7,2-5.9l0,0l0-0.2c-0.1-0.6,0-1.2,0.3-1.6C6.5,6.3,7,6,7.6,5.9c0.6-0.1,1.2,0,1.6,0.3
+			C9.7,6.5,10,7,10.1,7.6l0,0.2l0,0c0.5,2.9-0.1,5.7-1.7,8.1C8.4,16,8.3,16,8.3,16z"/>
+	</g>
+	<g>
+		<path fill="#ADADAD" d="M10.8,15.5c0,0-0.1,0-0.1,0c-0.1-0.1-0.2-0.2-0.1-0.3c1.2-2.5,1.5-5.2,1-7.9l0-0.1C11.1,5.3,9.2,4,7.3,4.4
+			C5.3,4.8,4.1,6.7,4.4,8.6l0,0.1c0.4,1.9-0.3,3.8-1.8,5c-0.1,0.1-0.2,0.1-0.3,0c-0.1-0.1-0.1-0.2,0-0.3c1.3-1.1,1.9-2.7,1.6-4.4
+			l0-0.1C3.5,6.6,5,4.4,7.2,4c2.2-0.4,4.4,1,4.9,3.2l0,0.1l0,0c0.5,2.7,0.2,5.5-1.1,8C11,15.4,10.9,15.5,10.8,15.5z"/>
+	</g>
+	<g>
+		<path fill="#ADADAD" d="M13.5,13.7C13.5,13.7,13.5,13.7,13.5,13.7c-0.2,0-0.3-0.2-0.2-0.3c0.6-2.1,0.6-4.3,0.2-6.4l0-0.1
+			c-0.6-3-3.6-5-6.6-4.4C3.9,3.1,2,6,2.5,9l0,0.1c0.2,1.1-0.2,2.3-1.1,3c-0.1,0.1-0.2,0.1-0.3,0c-0.1-0.1-0.1-0.2,0-0.3
+			c0.7-0.6,1.1-1.6,0.9-2.5l0-0.1C1.4,5.9,3.5,2.7,6.8,2.1c3.2-0.6,6.4,1.4,7.1,4.6l0,0l0,0.2c0.5,2.3,0.4,4.5-0.2,6.7
+			C13.7,13.6,13.6,13.7,13.5,13.7z"/>
+	</g>
+</g>
+</svg>

public/images/svg/key.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 14.5 16" enable-background="new 0 0 14.5 16" xml:space="preserve">
+<g>
+	<path fill="#C2C3C5" d="M9.5,7.5c0.4-0.2,0.8-0.4,1.2-0.7c1.7-1.5,1.7-4.1,0-5.6c-1.7-1.5-4.6-1.5-6.3,0c-1.7,1.5-1.7,4.1,0,5.6
+		C4.7,7,5.1,7.3,5.5,7.5l0,1.3L7,10.1l-1.5,1.4l0,0L7,12.8l-1.5,1.4l0,0l2,1.8l0,0h0l2-1.8L9.5,7.5z M6.4,3.7
+		c-0.6-0.5-0.6-1.4,0-1.9s1.5-0.5,2.1,0s0.6,1.4,0,1.9C8,4.2,7,4.2,6.4,3.7z"/>
+</g>
+</svg>

tests/.jshintrc

@@ -44,7 +44,8 @@
     "andThen",
     "currentURL",
     "currentPath",
-    "currentRouteName"
+    "currentRouteName",
+    "jQuery"
   ],
   "node": false,
   "browser": false,

tests/helpers/fill-in.js

@@ -0,0 +1,7 @@
+
+export default function (elem, text, event = 'keyup') {
+  var e = $.Event(event);
+  e.which = 50;
+  elem.val(text);
+  elem.trigger(e);
+}

tests/helpers/start-app.js

@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import Application from '../../app';
-import Router from '../../router';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {

tests/integration/components/add-env-var-test.js

@@ -0,0 +1,89 @@
+import Ember from 'ember';
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+import fillIn from '../../helpers/fill-in';
+
+
+moduleForComponent('add-env-var', 'Integration | Component | add env-var', {
+  integration: true
+});
+
+test('it adds an env var on submit', function(assert) {
+  assert.expect(6);
+
+  var store = this.container.lookup('store:main');
+  assert.equal(store.all('envVar').get('length'), 0, 'precond: store should be empty');
+
+  var repo;
+  Ember.run(function() {
+    repo  = store.push('repo', {id: 1, slug: 'travis-ci/travis-web'});
+  });
+
+  this.set('repo', repo);
+
+  this.render(hbs`{{add-env-var repo=repo}}`);
+
+  fillIn(this.$('.env-name'), 'FOO');
+  fillIn(this.$('.env-value'), 'bar');
+
+  this.$('.form-submit').click();
+
+  assert.equal(store.all('envVar').get('length'), 1, 'env var should be added to store');
+
+  var envVar = store.all('envVar').objectAt(0);
+
+  assert.equal(envVar.get('name'), 'FOO', 'name should be set for the env var');
+  assert.equal(envVar.get('value'), 'bar', 'value should be set for the env var');
+  assert.equal(envVar.get('repo.slug'), 'travis-ci/travis-web', 'repo should be set for the env var');
+  assert.ok(!envVar.get('public'), 'env var should be private');
+});
+
+test('it shows an error if no name is present', function(assert) {
+  assert.expect(3);
+
+  this.render(hbs`{{add-env-var repo=repo}}`);
+
+  this.$('.env-name').val();
+  assert.ok(Ember.isBlank(this.$('.env-name').val()), 'precond: name input should be empty');
+
+  this.$('.form-submit').click();
+
+  assert.ok(this.$('.form-error-message').length, 'the error message should be displayed');
+
+  fillIn(this.$('.env-name'), 'FOO');
+  fillIn(this.$('.env-value'), 'bar');
+
+  assert.ok(!this.$('.form-error-message').length, 'the error message should be removed after value is changed');
+});
+
+test('it adds a public env var on submit', function(assert) {
+  assert.expect(6);
+
+  var store = this.container.lookup('store:main');
+  assert.equal(store.all('envVar').get('length'), 0, 'precond: store should be empty');
+
+  var repo;
+  Ember.run(function() {
+    repo  = store.push('repo', {id: 1, slug: 'travis-ci/travis-web'});
+  });
+
+  this.set('repo', repo);
+
+  this.render(hbs`{{add-env-var repo=repo}}`);
+
+  fillIn(this.$('.env-name'), 'FOO');
+  fillIn(this.$('.env-value'), 'bar');
+
+  this.$('.switch').click();
+
+  this.$('.form-submit').click();
+
+  assert.equal(store.all('envVar').get('length'), 1, 'env var should be added to store');
+
+  var envVar = store.all('envVar').objectAt(0);
+
+  assert.equal(envVar.get('name'), 'FOO', 'name should be set for the env var');
+  assert.equal(envVar.get('value'), 'bar', 'value should be set for the env var');
+  assert.equal(envVar.get('repo.slug'), 'travis-ci/travis-web', 'repo should be set for the env var');
+  assert.ok(envVar.get('public'), 'env var should be public');
+});

tests/integration/components/add-ssh-key-test.js

@@ -0,0 +1,73 @@
+import Ember from 'ember';
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+import fillIn from '../../helpers/fill-in';
+
+
+moduleForComponent('add-ssh-key', 'Integration | Component | add ssh-key', {
+  integration: true
+});
+
+test('it adds an ssh key on submit', function(assert) {
+  assert.expect(6);
+
+  var store = this.container.lookup('store:main');
+
+  var repo;
+  Ember.run(function() {
+    repo  = store.push('repo', {id: 1, slug: 'travis-ci/travis-web'});
+  });
+
+  this.set('repo', repo);
+
+  this.render(hbs`{{add-ssh-key repo=repo sshKeyAdded="sshKeyAdded"}}`);
+
+  var sshKey = store.all('sshKey').objectAt(0);
+
+  assert.ok(! sshKey.get('description'), 'description should be blank');
+  assert.ok(! sshKey.get('value'), 'value should be blank');
+  assert.equal(sshKey.get('id'), 1, 'ssh key id is set to repo id');
+
+  fillIn(this.$('.ssh-description'), 'FOO');
+  fillIn(this.$('.ssh-value'), 'bar');
+
+  this.$('.form-submit').click();
+
+  assert.equal(sshKey.get('description'), 'FOO', 'description should be set');
+  assert.equal(sshKey.get('value'), 'bar', 'value should be set');
+  assert.equal(sshKey.get('id'), 1, 'ssh key id should still be repo id');
+
+});
+
+
+test('it throws an error if value for ssh key is blank', function(assert) {
+  assert.expect(5);
+
+  var store = this.container.lookup('store:main');
+
+  var repo;
+  Ember.run(function() {
+    repo  = store.push('repo', {id: 1, slug: 'travis-ci/travis-web'});
+  });
+
+  this.set('repo', repo);
+
+  this.render(hbs`{{add-ssh-key repo=repo sshKeyAdded="sshKeyAdded"}}`);
+
+  var sshKey = store.all('sshKey').objectAt(0);
+
+  assert.ok(! sshKey.get('description'), 'description should be blank');
+  assert.ok(! sshKey.get('value'), 'value should be blank');
+  assert.equal(sshKey.get('id'), 1, 'ssh key id is set to repo id');
+
+  fillIn(this.$('.ssh-description'), 'FOO');
+  fillIn(this.$('.ssh-value'), '');
+
+  this.$('.form-submit').click();
+
+  assert.ok(this.$('.form-error-message').length, 'there is an error message if value is blank');
+
+  fillIn(this.$('.ssh-value'), 'bar');
+  assert.ok(!this.$('.form-error-message').length, 'error message is removed if value is filled in');
+
+});

tests/integration/components/env-var-test.js

@@ -0,0 +1,60 @@
+import Ember from 'ember';
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+import fillIn from '../../helpers/fill-in';
+
+
+moduleForComponent('env-var', 'Integration | Component | env-var', {
+  integration: true
+});
+
+test('it renders an env-var with private value', function(assert) {
+  assert.expect(2);
+
+  var store = this.container.lookup('store:main');
+  Ember.run(() => {
+    var envVar = store.push('envVar', {id: 1, name: 'foo', value: 'bar', public: false});
+    this.set('envVar', envVar);
+  });
+
+  this.render(hbs`{{env-var envVar=envVar}}`);
+
+  assert.equal(this.$('.env-var-name').text(), 'foo', 'name should be displayed');
+  assert.equal(this.$('.env-var-value input').val(), '••••••••••••••••', 'value should be hidden');
+
+});
+
+test('it renders an env-var with public value', function(assert) {
+  assert.expect(2);
+
+  var store = this.container.lookup('store:main');
+  Ember.run(() => {
+    var envVar = store.push('envVar', {id: 1, name: 'foo', value: 'bar', public: true});
+    this.set('envVar', envVar);
+  });
+
+  this.render(hbs`{{env-var envVar=envVar}}`);
+
+  assert.equal(this.$('.env-var-name').text(), 'foo', 'name should be displayed');
+  assert.equal(this.$('.env-var-value input').val(), 'bar', 'value should be hidden');
+
+});
+
+// test('it deletes an env-var', function(assert) {
+//   assert.expect(2);
+
+//   var store = this.container.lookup('store:main');
+//   Ember.run(() => {
+//     var envVar = store.push('envVar', {id: 1, name: 'foo', value: 'bar', public: true});
+//     this.set('envVar', envVar);
+//   });
+
+//   this.render(hbs`{{env-var envVar=envVar}}`);
+
+//   assert.equal(store.all('envVar').get('length'), 1, 'precond: store should have an env-var');
+
+//   this.$('.env-var-action a').click();
+
+//   assert.equal(store.all('envVar').get('length'), 0, 'env-var should be deleted');
+
+// });

tests/integration/components/ssh-key-test.js

@@ -0,0 +1,62 @@
+import Ember from 'ember';
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+import fillIn from '../../helpers/fill-in';
+
+
+moduleForComponent('ssh-key', 'Integration | Component | ssh-key', {
+  integration: true
+});
+
+test('it renders the default ssh key if no custom key is set', function(assert) {
+  assert.expect(2);
+
+  var store = this.container.lookup('store:main');
+
+  var key = Ember.Object.create({fingerprint: 'fingerprint'});
+  this.set('key', key);
+  this.render(hbs`{{ssh-key key=key sshKeyDeleted="sshKeyDeleted"}}`);
+
+  assert.equal(this.$('.ssh-key-name').text().trim(), 'no custom key set', 'should display that no custom key is set');
+  assert.equal(this.$('.ssh-key-value').text().trim(), 'fingerprint', 'should display default key fingerprint');
+
+});
+
+test('it renders the custom ssh key if custom key is set', function(assert) {
+  assert.expect(2);
+
+  var store = this.container.lookup('store:main');
+
+  var key;
+  Ember.run(function() {
+    key = store.push('sshKey', {description: 'fookey', fingerprint: 'somethingthing', id: 1});
+  });
+
+  this.set('key', key);
+  this.render(hbs`{{ssh-key key=key sshKeyDeleted="sshKeyDeleted"}}`);
+
+  assert.equal(this.$('.ssh-key-name').text().trim(), 'fookey', 'should display key description');
+  assert.equal(this.$('.ssh-key-value').text().trim(), 'somethingthing', 'should display custom key fingerprint');
+
+});
+
+
+test('it deletes a custom key', function(assert) {
+  assert.expect(1);
+
+  var store = this.container.lookup('store:main');
+
+  var key;
+  Ember.run(function() {
+    key = store.push('sshKey', {description: 'fookey', fingerprint: 'somethingthing', id: 1});
+  });
+
+  this.set('key', key);
+  this.render(hbs`{{ssh-key key=key sshKeyDeleted="sshKeyDeleted"}}`);
+  this.on('sshKeyDeleted', function() {});
+
+  this.$('.ssh-key-action a').click();
+
+  assert.ok(key.get('isDeleted'), 'key should be deleted');
+
+});

tests/unit/components/add-env-var-test.coffee

@@ -0,0 +1,17 @@
+`import { test, moduleForComponent } from 'ember-qunit'`
+
+moduleForComponent 'env-var', {
+  # specify the other units that are required for this test
+  # needs: ['component:foo', 'helper:bar']
+}
+
+test 'it renders', (assert) ->
+  assert.expect 2
+
+  # creates the component instance
+  component = @subject()
+  assert.equal component._state, 'preRender'
+
+  # renders the component to the page
+  @render()
+  assert.equal component._state, 'inDOM'

tests/unit/components/builds-item-test.coffee

@@ -25,7 +25,9 @@ test 'it renders', (assert) ->
       slug: 'foo/bar'
     }
   }
-  component = @subject(build: attributes)
+
+  component = @subject()
+  component.set('build', attributes)
   @append()
 
   ok component.$().hasClass('passed'), 'component has right status class'

tests/unit/components/env-var-test.coffee

@@ -0,0 +1,17 @@
+`import { test, moduleForComponent } from 'ember-qunit'`
+
+moduleForComponent 'env-var', {
+  # specify the other units that are required for this test
+  # needs: ['component:foo', 'helper:bar']
+}
+
+test 'it renders', (assert) ->
+  assert.expect 2
+
+  # creates the component instance
+  component = @subject()
+  assert.equal component._state, 'preRender'
+
+  # renders the component to the page
+  @render()
+  assert.equal component._state, 'inDOM'

tests/unit/components/hooks-list-item-test.coffee

@@ -20,5 +20,5 @@ test 'it renders', ->
   @append()
 
   ok component.$().hasClass('active'), 'component should have active class'
-  ok component.$('.travis-switch').hasClass('active'), 'switch should have active class'
+  ok component.$('.switch--icon').hasClass('active'), 'switch should have active class'
   equal component.$('.profile-repo span').text().trim(), 'A foo repo', 'repo description should be displayed'

tests/unit/components/settings-switch-test.coffee

@@ -0,0 +1,17 @@
+`import { test, moduleForComponent } from 'ember-qunit'`
+
+moduleForComponent 'settings-switch', {
+  # specify the other units that are required for this test
+  # needs: ['component:foo', 'helper:bar']
+}
+
+test 'it renders', (assert) ->
+  assert.expect 2
+
+  # creates the component instance
+  component = @subject()
+  assert.equal component._state, 'preRender'
+
+  # renders the component to the page
+  @render()
+  assert.equal component._state, 'inDOM'

tests/unit/components/ssh-key-test.coffee

@@ -0,0 +1,17 @@
+`import { test, moduleForComponent } from 'ember-qunit'`
+
+moduleForComponent 'ssh-key', {
+  # specify the other units that are required for this test
+  # needs: ['component:foo', 'helper:bar']
+}
+
+test 'it renders', (assert) ->
+  assert.expect 2
+
+  # creates the component instance
+  component = @subject()
+  assert.equal component._state, 'preRender'
+
+  # renders the component to the page
+  @render()
+  assert.equal component._state, 'inDOM'

tests/unit/controllers/settings-test.coffee

@@ -0,0 +1,12 @@
+`import { test, moduleFor } from 'ember-qunit'`
+
+moduleFor 'controller:settings', {
+  # Specify the other units that are required for this test.
+  # needs: ['controller:foo']
+}
+
+# Replace this with your real tests.
+test 'it exists', (assert) ->
+  controller = @subject()
+  assert.ok controller
+