Merge pull request #432 from travis-ci/ps-remove-deprecations

Remove deprecations in preparation for 2.x update

app/adapters/application.js

@@ -7,6 +7,16 @@ export default DS.ActiveModelAdapter.extend({
   host: config.apiEndpoint,
   coalesceFindRequests: true,
 
+  // Before Ember Data 2.0 the default behaviour of running `findAll` was to get
+  // new records only when there're no records in the store. This will change
+  // to a different strategy in 2.0: when you run `findAll` it will not get any
+  // new data initially, but it will try loading new data in the background.
+  // 
+  // I'm disabling the new behaviour for now.
+  shouldBackgroundReloadRecord() {
+    return false;
+  },
+
   ajaxOptions(url, type, options) {
     var base, hash, token;
 

app/adapters/env-var.js

@@ -7,7 +7,7 @@ export default ApplicationAdapter.extend({
   buildURL(type, id, record) {
     var delimiter, repoId, url;
     url = this._super.apply(this, arguments);
-    if (record && (repoId = Ember.get(record, 'repo.id'))) {
+    if (record && record.belongsTo('repo') && (repoId = record.belongsTo('repo').id)) {
       delimiter = url.indexOf('?') !== -1 ? '&' : '?';
       url = "" + url + delimiter + "repository_id=" + repoId;
     }
@@ -15,12 +15,12 @@ export default ApplicationAdapter.extend({
   },
 
   updateRecord(store, type, record) {
-    var data, id, serializer;
+    var data, serializer;
     data = {};
-    serializer = store.serializerFor(type.typeKey);
+    serializer = store.serializerFor(type.modelName);
     serializer.serializeIntoHash(data, type, record);
-    id = Ember.get(record, 'id');
+    var id = record.id;
-    return this.ajax(this.buildURL(type.typeKey, id, record), "PATCH", {
+    return this.ajax(this.buildURL(type.modelName, id, record), "PATCH", {
       data: data
     });
   }

app/adapters/ssh-key.js

@@ -4,24 +4,24 @@ import ApplicationAdapter from 'travis/adapters/application';
 export default ApplicationAdapter.extend({
   namespace: 'settings',
 
-  find(store, type, id, record) {
+  findRecord(store, type, id, record) {
     return this.ajax(this.urlPrefix() + '/ssh_key/' + id, 'GET');
   },
 
   deleteRecord(store, type, record) {
-    var id;
+    var id = record.id;
-    id = Ember.get(record, 'id');
     return this.ajax(this.urlPrefix() + '/ssh_key/' + id, "DELETE");
   },
 
   createRecord(store, type, record) {
-    var data, id, serializer;
+    var data, serializer;
     data = {};
-    serializer = store.serializerFor(type.typeKey);
+    serializer = store.serializerFor(type.modelName);
     serializer.serializeIntoHash(data, type, record, {
       includeId: true
     });
-    id = Ember.get(record, 'id');
+
+    var id = record.id;
     return this.ajax(this.urlPrefix() + '/ssh_key/' + id, "PATCH", {
       data: data
     });

app/app.js

@@ -5,7 +5,7 @@ import config from './config/environment';
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
-Ember.LinkView.reopen({
+Ember.LinkComponent.reopen({
   attributeBindings: ['alt']
 });
 

app/components/add-ssh-key.js

@@ -11,7 +11,7 @@ export default Ember.Component.extend({
     var model = this.get('store').recordForId('ssh_key', id);
 
     if (model) {
-      this.get('store').dematerializeRecord(model._internalModel);
+      this.get('store').unloadRecord(model);
       var typeMap = this.get('store').typeMapFor(model.constructor);
       var idToRecord = typeMap.idToRecord;
       delete idToRecord[id];
@@ -62,7 +62,8 @@ export default Ember.Component.extend({
       }
       this.set('isSaving', true);
       if (this.isValid()) {
-        ssh_key = this.get('model').setProperties({
+        ssh_key = this.get('model');
+        ssh_key.setProperties({
           description: this.get('description'),
           value: this.get('value')
         });

app/components/build-wrapper.js

@@ -1,11 +1,10 @@
+import Ember from 'ember';
 import { colorForState } from 'travis/utils/helpers';
-import BasicView from 'travis/views/basic';
 import Polling from 'travis/mixins/polling';
 
-export default BasicView.extend(Polling, {
+export default Ember.Component.extend({
   classNameBindings: ['color'],
-  buildBinding: 'controller.build',
+  pollModels: 'build',
-  pollModels: 'controller.build',
 
   color: function() {
     return colorForState(this.get('build.state'));

app/components/builds-wrapper.js

@@ -1,12 +1,15 @@
-import BasicView from 'travis/views/basic';
+import Ember from 'ember';
 import Polling from 'travis/mixins/polling';
 
-export default BasicView.extend(Polling, {
+export default Ember.Component.extend({
+  store: Ember.inject.service('store'),
+
   pollHook: function(store) {
     var contentType, repositoryId;
-    contentType = this.get('controller.contentType');
+    contentType = this.get('contentType');
-    repositoryId = this.get('controller.repo.id');
+    repositoryId = this.get('repo.id');
-    store = this.get('controller.store');
+    store = this.get('store');
+
     if (contentType === 'builds') {
       return store.query('build', {
         event_type: 'push',

app/components/env-var.js

@@ -8,7 +8,7 @@ export default Ember.Component.extend({
   actionType: 'Save',
   showValueField: Ember.computed.alias('public'),
 
-  value: function(key, value) {
+  value: function(key) {
     if (this.get('envVar.public')) {
       return this.get('envVar.value');
     } else {

app/components/job-log.js

@@ -3,36 +3,24 @@ import Ember from 'ember';
 export default Ember.Component.extend({
   logBinding: 'job.log',
 
-  didInsertElement() {
+  didReceiveAttrs: function(options) {
-    return this.setupLog();
+    this._super(...arguments);
-  },
 
-  logDidChange: function() {
+    if(options.oldAttrs && options.oldAttrs.job) {
-    return this.setupLog();
+      this.teardownLog(options.oldAttrs.job.value);
-  }.observes('log'),
+    }
 
-  logWillChange: function() {
+    if(options.newAttrs && options.newAttrs.job) {
-    return this.teardownLog();
+      this.setupLog(options.newAttrs.job.value);
-  }.observesBefore('log'),
-
-  willDestroyElement() {
-    return this.teardownLog();
-  },
-
-  teardownLog() {
-    var job;
-    job = this.get('job');
-    if (job) {
-      return job.unsubscribe();
     }
   },
 
-  setupLog() {
+  teardownLog(job) {
-    var job;
+    job.unsubscribe();
-    job = this.get('job');
+  },
-    if (job) {
+
+  setupLog(job) {
     job.get('log').fetch();
-      return job.subscribe();
+    job.subscribe();
-    }
   }
 });

app/components/job-wrapper.js

@@ -3,10 +3,8 @@ import { colorForState } from 'travis/utils/helpers';
 import { githubCommit } from 'travis/utils/urls';
 import Polling from 'travis/mixins/polling';
 
-export default Ember.View.extend(Polling, {
+export default Ember.Component.extend({
-  pollModels: 'controller.job.build',
+  pollModels: 'job.build',
-  repoBinding: 'controller.repo',
-  jobBinding: 'controller.job',
   commitBinding: 'job.commit',
   currentItemBinding: 'job',
 
@@ -16,5 +14,5 @@ export default Ember.View.extend(Polling, {
 
   urlGithubCommit: function() {
     return githubCommit(this.get('repo.slug'), this.get('commit.sha'));
-  }.property('repo.slug', 'commit.sha'),
+  }.property('repo.slug', 'commit.sha')
 });

app/components/log-content.js

@@ -68,14 +68,14 @@ export default Ember.Component.extend({
       console.log('log view: did insert');
     }
     this._super.apply(this, arguments);
-    return this.createEngine();
+    Ember.run.scheduleOnce('afterRender', this, 'createEngine');
   },
 
   willDestroyElement() {
     if (Log.DEBUG) {
       console.log('log view: will destroy');
     }
-    return this.teardownLog();
+    Ember.run.scheduleOnce('afterRender', this, 'teardownLog');
   },
 
   teardownLog(log) {
@@ -121,7 +121,7 @@ export default Ember.Component.extend({
       this.engine.limit = this.limit;
       this.logFolder = new LogFolder(this.$('#log'));
       this.lineSelector = new LinesSelector(this.$('#log'), this.scroll, this.logFolder);
-      return this.observeParts(log);
+      this.observeParts(log);
     }
   },
 
@@ -158,7 +158,7 @@ export default Ember.Component.extend({
     if (Log.DEBUG) {
       console.log('log view: parts did change');
     }
-    if (this.get('state') !== 'inDOM') {
+    if (this.get('_state') !== 'inDOM') {
       return;
     }
     ref = parts.slice(start, start + added);

app/components/popup-click-handler.js

@@ -1,18 +1,17 @@
-import BasicView from 'travis/views/basic';
 import Ember from 'ember';
 
-export default BasicView.extend({
+export default Ember.Component.extend({
   popup: Ember.inject.service(),
   classNames: ['application'],
 
   click(event) {
-    var targetAndParents;
+    var targetAndParents = $(event.target).parents().andSelf();
-    targetAndParents = $(event.target).parents().andSelf();
+
     if (!(targetAndParents.hasClass('open-popup') || targetAndParents.hasClass('popup'))) {
       this.get('popup').close();
     }
     if (!targetAndParents.hasClass('menu') && !targetAndParents.is('#tools > a')) {
-      return $('.menu').removeClass('display');
+      $('.menu').removeClass('display');
     }
   }
 });

app/components/profile-accounts-wrapper.js

@@ -0,0 +1,6 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  classNames: ['profile-orglist', 'columns', 'medium-4'],
+  tagName: 'aside',
+});

app/components/repo-wrapper.js

@@ -0,0 +1,7 @@
+import Polling from 'travis/mixins/polling';
+import Ember from 'ember';
+
+export default Ember.Component.extend(Polling, {
+  pollModels: 'repo',
+  classNameBindings: ['isLoading:loading']
+});

app/components/repos-list-tabs.js

@@ -1,13 +1,14 @@
 import Ember from 'ember';
 
-export default Ember.View.extend({
+export default Ember.Component.extend({
-  templateName: 'repos/list/tabs',
+  auth: Ember.inject.service(),
-  tabBinding: 'controller.tab',
+
-  currentUserBinding: 'controller.currentUser.model',
+  currentUserBinding: 'auth.currentUser',
+
   classRecent: function() {
     if (this.get('tab') === 'recent') {
       return 'active';
-    } else if (this.get('tab') === 'search' && this.get('controller').auth.get('signedIn')) {
+    } else if (this.get('tab') === 'search' && this.get('auth.signedIn')) {
       return 'hidden';
     }
   }.property('tab'),

app/components/status-images.js

@@ -0,0 +1,24 @@
+import Ember from 'ember';
+import { format as formatStatusImage } from 'travis/utils/status-image-formats';
+
+export default Ember.Component.extend({
+  popup: Ember.inject.service(),
+
+  id: 'status-images',
+  attributeBindings: ['id'],
+  classNames: ['popup', 'status-images'],
+  formats: ['Image URL', 'Markdown', 'Textile', 'Rdoc', 'AsciiDoc', 'RST', 'Pod', 'CCTray'],
+
+  actions: {
+    close() {
+      return this.get('popup').close();
+    }
+  },
+
+  statusString: function() {
+    let format = this.get('format') || this.get('formats.firstObject'),
+        branch = this.get('branch') || 'master';
+
+    return formatStatusImage(format, this.get('repo.slug'), branch);
+  }.property('format', 'repo.slug', 'branch')
+});

app/components/travis-layout.js

@@ -0,0 +1,3 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({});

app/controllers/accounts.js

@@ -1,3 +1,3 @@
 import Ember from 'ember';
 
-export default Ember.ArrayController.extend();
+export default Ember.Controller.extend();

app/controllers/builds.js

@@ -1,49 +1,33 @@
 import Ember from 'ember';
 
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
   sortAscending: false,
   sortProperties: ['number'],
   repoController: Ember.inject.controller('repo'),
   repoBinding: 'repoController.repo',
   tabBinding: 'repoController.tab',
-  isLoadedBinding: 'content.isLoaded',
+  isLoadedBinding: 'model.isLoaded',
-  isLoadingBinding: 'content.isLoading',
+  isLoadingBinding: 'model.isLoading',
 
   showMore() {
     var id, number, type;
     id = this.get('repo.id');
-    number = this.get('lastObject.number');
+    number = this.get('model.lastObject.number');
-    type = this.get('tab') === "builds" ? 'push' : 'pull_request';
+    type = this.get('tab') === "model" ? 'push' : 'pull_request';
-    return this.get('content').load(this.olderThanNumber(id, number, type));
+    return this.get('model').load(this.olderThanNumber(id, number, type));
   },
 
   displayShowMoreButton: function() {
-    return this.get('tab') !== 'branches' && parseInt(this.get('lastObject.number')) > 1;
+    return this.get('tab') !== 'branches' && parseInt(this.get('model.lastObject.number')) > 1;
-  }.property('tab', 'lastObject.number'),
+  }.property('tab', 'model.lastObject.number'),
 
   displayPullRequests: function() {
-    if (this.get('tab') === 'pull_requests') {
+    return this.get('tab') === 'pull_requests';
-      if (Ember.isEmpty(this.get('repo.pullRequests.content'))) {
+  }.property('tab'),
-        return true;
-      } else {
-        return false;
-      }
-    } else {
-      return false;
-    }
-  }.property('tab', 'repo.builds', 'repo.pullRequests'),
 
   displayBranches: function() {
-    if (this.get('tab') === 'branches') {
+    return this.get('tab') === 'branches';
-      if (Ember.isEmpty(this.get('repo.branches.content.content'))) {
+  }.property('tab'),
-        return true;
-      } else {
-        return false;
-      }
-    } else {
-      return false;
-    }
-  }.property('tab', 'repo.builds', 'repo.branches'),
 
   noticeData: function() {
     return {

app/controllers/error.js

@@ -1,3 +1,15 @@
 import Ember from 'ember';
 
-export default Ember.Controller.extend();
+export default Ember.Controller.extend({
+  layoutName: Ember.computed({
+    get(key) {
+      if(this._layoutName) {
+        return 'layouts/' + this._layoutName;
+      }
+    },
+
+    set(key, value) {
+      return this._layoutName = value;
+    }
+  })
+});

app/controllers/loading.js

@@ -1,3 +1,15 @@
 import Ember from 'ember';
 
-export default Ember.Controller.extend();
+export default Ember.Controller.extend({
+  layoutName: Ember.computed({
+    get(key) {
+      if(this._layoutName) {
+        return 'layouts/' + this._layoutName;
+      }
+    },
+
+    set(key, value) {
+      return this._layoutName = value;
+    }
+  })
+});

app/controllers/repo.js

@@ -1,11 +1,16 @@
 import Ember from 'ember';
-import { githubRepo } from 'travis/utils/urls';
+import { githubRepo, statusImage } from 'travis/utils/urls';
+import config from 'travis/config/environment';
+
 
 export default Ember.Controller.extend({
+  popup: Ember.inject.service(),
+
   jobController: Ember.inject.controller('job'),
   buildController: Ember.inject.controller('build'),
   buildsController: Ember.inject.controller('builds'),
   reposController: Ember.inject.controller('repos'),
+  reposBinding: 'reposController.repos',
   currentUserBinding: 'auth.currentUser',
 
   classNames: ['repo'],
@@ -14,6 +19,21 @@ export default Ember.Controller.extend({
   builds: Ember.computed.alias('buildsController.content'),
   job: Ember.computed.alias('jobController.job'),
 
+  isEmpty: function() {
+    return this.get('repos.isLoaded') && this.get('repos.length') === 0;
+  }.property('repos.isLoaded', 'repos.length'),
+
+  statusImageUrl: function() {
+    return statusImage(this.get('repo.slug'));
+  }.property('repo.slug'),
+
+  actions: {
+    statusImages() {
+      this.get('popup').open('status-images');
+      return false;
+    }
+  },
+
   slug: function() {
     return this.get('repo.slug');
   }.property('repo.slug'),

app/controllers/repos.js

@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import limit from 'travis/utils/computed-limit';
 import Repo from 'travis/models/repo';
 import Config from 'travis/config/environment';
 
@@ -202,7 +201,7 @@ var Controller = Ember.Controller.extend({
       Ember.run.cancel(this.searchLater);
     }
     this.searchLater = Ember.run.later(this, (function() {
-      this.transitionTo('main.search', phrase.replace(/\//g, '%2F'));
+      this.transitionToRoute('main.search', phrase.replace(/\//g, '%2F'));
     }), 500);
   },
 

app/controllers/requests.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
   repoController: Ember.inject.controller('repo'),
 
   lintUrl: function() {

app/controllers/top.js

@@ -102,5 +102,17 @@ export default Ember.Controller.extend({
   },
   showCta: function() {
     return !this.get('auth.signedIn') && !this.get('config.pro') && !this.get('landingPage');
-  }.property('auth.signedIn', 'landingPage')
+  }.property('auth.signedIn', 'landingPage'),
+
+  classProfile: function() {
+    var classes = ['profile menu'];
+
+    if (this.get('tab') === 'profile') {
+      classes.push('active');
+    }
+
+    classes.push(this.get('controller.auth.state') || 'signed-out');
+
+    return classes.join(' ');
+  }.property('tab', 'auth.state')
 });

app/mixins/polling.js

@@ -3,6 +3,12 @@ import Ember from 'ember';
 export default Ember.Mixin.create({
   polling: Ember.inject.service(),
 
+  init() {
+    this.set('currentPollModels', {});
+
+    return this._super(...arguments);
+  },
+
   didInsertElement() {
     this._super.apply(this, arguments);
     return this.startPolling();
@@ -17,16 +23,20 @@ export default Ember.Mixin.create({
     return this.pollModel(key);
   },
 
-  pollModelWillChange(sender, key, value) {
-    return this.stopPollingModel(key);
-  },
-
   pollModel(property) {
-    var addToPolling, model;
+    var model = this.get(property),
-    addToPolling = () => {
+        currentPollModels = this.get('currentPollModels');
+
+    if(currentPollModels[property]) {
+      this.get('polling').stopPolling(currentPollModels[property]);
+    }
+    currentPollModels[property] = model;
+
+    var addToPolling = () => {
       return this.get('polling').startPolling(model);
     };
-    if (model = this.get(property)) {
+
+    if (model) {
       if (model.then) {
         return model.then(function(resolved) {
           return addToPolling(resolved);
@@ -38,8 +48,8 @@ export default Ember.Mixin.create({
   },
 
   stopPollingModel(property) {
-    var model;
+    var model = this.get(property);
-    if (model = this.get(property)) {
+    if (model) {
       return this.get('polling').stopPolling(model);
     }
   },
@@ -54,7 +64,6 @@ export default Ember.Mixin.create({
       pollModels.forEach( (property) => {
         this.pollModel(property);
         this.addObserver(property, this, 'pollModelDidChange');
-        return Ember.addBeforeObserver(this, property, this, 'pollModelWillChange');
       });
     }
     if (this.pollHook) {
@@ -63,15 +72,15 @@ export default Ember.Mixin.create({
   },
 
   stopPolling() {
-    var pollModels;
+    var pollModels = this.get('pollModels');
-    if (pollModels = this.get('pollModels')) {
+
+    if (pollModels) {
       if (!Ember.isArray(pollModels)) {
         pollModels = [pollModels];
       }
       pollModels.forEach( (property) => {
         this.stopPollingModel(property);
         this.removeObserver(property, this, 'pollModelDidChange');
-        return Ember.removeBeforeObserver(this, property, this, 'pollModelWillChange');
       });
     }
     return this.get('polling').stopPollingHook(this);

app/models/repo.js

@@ -220,7 +220,7 @@ Repo.reopenClass({
       return promise;
     } else {
       login = reposIdsOrlogin;
-      return store.find('repo', {
+      return store.query('repo', {
         member: login,
         orderBy: 'name'
       });
@@ -253,7 +253,7 @@ Repo.reopenClass({
         });
       });
     } else {
-      return store.find('repo', {
+      return store.query('repo', {
         search: query,
         orderBy: 'name'
       });
@@ -299,7 +299,7 @@ Repo.reopenClass({
           return repo;
         });
       } else {
-        promise = store.find('repo', {
+        promise = store.query('repo', {
           slug: slug
         }).then(function(repos) {
           return repos.get('firstObject') || (function() {

app/routes/auth.js

@@ -5,7 +5,7 @@ export default TravisRoute.extend({
 
   renderTemplate() {
     $('body').attr('id', 'auth');
-    return this.render('auth.signin');
+    return this.render('signin');
   },
 
   deactivate() {

app/services/popup.js

@@ -9,11 +9,6 @@ export default Ember.Service.extend({
   },
 
   close() {
-    var view;
-    if (view = Ember.View.currentPopupView) {
-      view.destroy();
-      Ember.View.currentPopupView = null;
-    }
     return $('.popup').removeClass('display');
   }
 });

app/templates/account.hbs

@@ -1,14 +1,15 @@
 {{#if allHooks.isLoaded}}
 
   <header>
+
   {{#if config.billingEndpoint}}
     <div class="cta-btn">
-    {{#if view.subscribed}}
+    {{#if subscribeButtonInfo.subscribed}}
       <a class="btn btn-activated" href={{billingUrl}}>
         Subscription active!
       </a>
     {{else}}
-      {{#if view.education}}
+      {{#if subscribeButtonInfo.education}}
         <a class="btn btn-activated" href={{billingUrl}}>
           Educational account!
         </a>
@@ -42,19 +43,19 @@
     <ol class="row">
       <li class="columns medium-4">
         <figure>
-          <img src="/images/ui/hooks-step-1-01.svg" alt="">
+          <img src="/images/ui/hooks-step-1-01.svg" alt="Flick the repo switch">
           <figcaption>Flick the repository switch on</figcaption>
         </figure>
       </li>
       <li class="columns medium-4">
         <figure>
-          <img src="/images/ui/hooks-step-2-01.svg" alt="">
+          <img src="/images/ui/hooks-step-2-01.svg" alt="Add .travis.yml file">
           <figcaption>Add .travis.yml file to your repository</figcaption>
         </figure>
       </li>
       <li class="columns medium-4">
         <figure>
-          <img src="/images/ui/hooks-step-3-01.svg" alt="">
+          <img src="/images/ui/hooks-step-3-01.svg" alt="Do a git push">
           <figcaption>Trigger your first build with a git push</figcaption>
         </figure>
       </li>

app/templates/application.hbs

@@ -1 +1,3 @@
-{{outlet}}
+{{#popup-click-handler}}
+  {{outlet}}
+{{/popup-click-handler}}

app/templates/build.hbs

@@ -1,3 +1,4 @@
+{{#build-wrapper build=build}}
 {{#if loading}}
   {{loading-indicator}}
 {{else}}
@@ -16,3 +17,4 @@
   {{/if}}
 
 {{/if}}
+{{/build-wrapper}}

app/templates/builds.hbs

@@ -1,6 +1,7 @@
-{{#if content.isLoaded}}
+{{#builds-wrapper contentType=contentType repo=repo}}
+{{#if model.isLoaded}}
   <ul class="build-list">
-    {{#each controller as |build|}}
+    {{#each model as |build|}}
       {{builds-item build=build}}
     {{else}}
       {{no-builds repo=noticeData isPR=displayPullRequests isBranch=displayBranches}}
@@ -18,3 +19,4 @@
 {{else}}
   {{loading-indicator}}
 {{/if}}
+{{/builds-wrapper}}

app/templates/components/repos-empty.hbs

@@ -6,7 +6,7 @@
   <p>You're only two steps away from using Travis:</p>
 
   <ul>
-    <li> Hook up {{#link-to "profile.index" class="signed-in"}}one or more of your GitHub repositories{{/link-to}} with Travis.</li>
+    <li> Hook up {{#link-to "profile" class="signed-in"}}one or more of your GitHub repositories{{/link-to}} with Travis.</li>
     <li> Push some code!</li>
   </ul>
 

app/templates/components/repos-list-tabs.hbs

@@ -1,16 +1,16 @@
 <div class="tabnav tabnav--sidebar" role="tablist">
   <ul class="tab tabs--sidebar">
-    <li id="tab_owned" class={{view.classOwned}}>
+    <li id="tab_owned" class={{classOwned}}>
-      <a href="#" {{action "showMyRepositories"}}>My Repositories</a>
+      <a href="#" {{action showMyRepositories}}>My Repositories</a>
     </li>
 
     {{#if config.pro}}
-      <li id="tab_running" class={{view.classRunning}}>
+      <li id="tab_running" class={{classRunning}}>
-        <a href="#" {{action "showRunningJobs"}}>Running ({{startedJobsCount}}/{{allJobsCount}})</a>
+        <a href="#" {{action showRunningJobs}}>Running ({{startedJobsCount}}/{{allJobsCount}})</a>
       </li>
     {{/if}}
 
-    <li id="tab_new" class={{view.classNew}}>
+    <li id="tab_new" class={{classNew}}>
       {{#link-to "profile" trackEvent="add-repository-from-list" title="Add New Repository"}}
         <span class="icon icon--plus"></span>
       {{/link-to}}

app/templates/components/status-images.hbs

@@ -0,0 +1,25 @@
+<a href="#" class="close" {{action "close"}}></a>
+<p>
+  <label>Branch:</label>
+  {{#if branches.isLoaded}}
+    {{#x-select value=branch}}
+      {{#each branches as |branch|}}
+        {{#x-option value=branch.commit.branch}}{{branch.commit.branch}}{{/x-option}}
+      {{/each}}
+    {{/x-select}}
+  {{else}}
+    {{loading-indicator}}
+  {{/if}}
+</p>
+
+<p>
+  <label>
+  {{#x-select value=format}}
+    {{#each formats as |format|}}
+      {{#x-option value=format}}{{format}}{{/x-option}}
+    {{/each}}
+  {{/x-select}}
+
+  </label>
+  {{status-image-input value=statusString class="url" rows=3}}
+</p>

app/templates/dashboard.hbs

@@ -1 +1,3 @@
-{{outlet}}
+{{#travis-layout layoutName="layouts/dashboard" class="dashboard"}}
+  {{outlet}}
+{{/travis-layout}}

app/templates/env-vars/_form.hbs

@@ -1,27 +0,0 @@
-<form class="env-var" {{action "save" on="submit"}}>
-  {{#travis-field "name"}}
-    {{#label for="name" class="name"}}Name:{{/label}}
-    {{input value=name class="env-name" placeholder="Name"}} {{travis-errors "name"}}
-  {{/travis-field}}
-  <span class="equals">=</span>
-  {{#if showValueField}}
-    <div class="field value value--extra">
-      {{#label for="value" class="value"}}Value:{{/label}}
-      {{input value=value class="env-value" placeholder="Value"}}
-    </div>
-  {{else}}
-    <div class="field name">
-      <span class="value value-display secure">{{value}}</span>
-    </div>
-  {{/if}}
-  <div class="field field--switch">
-    {{travis-switch active=public}}
-    {{#label for="secure" class="public"}}Display value in build logs{{/label}}
-  </div>
-
-  <div class="actions">
-    <input type="submit" value={{actionType}} class="submit-env-var {{if isSaving 'saving'}}" disabled={{isSaving}} />
-    <span class="or">or</span>
-    <a href="#" class="cancel-env-var" {{action "cancel"}}>Cancel</a>
-  </div>
-</form>

app/templates/env-vars/index.hbs

@@ -1 +0,0 @@
-{{#link-to "env_vars.new" class="add-env-var"}}Add a new variable{{/link-to}}

app/templates/env-vars/new.hbs

@@ -1 +0,0 @@
-{{partial 'env_vars/form'}}

app/templates/error404.hbs

@@ -1,3 +1,4 @@
+{{#travis-layout layoutName="layouts/error" class="error error404"}}
 <div class="error-bg full-size">
   <div class="hill-left full-size"></div>
   <div class="hill-right full-size"></div>
@@ -8,3 +9,4 @@
   <h1>404: Something's Missing</h1>
   <p>We're sorry! It seems like this page cannot be found.</p>
 </div>
+{{/travis-layout}}

app/templates/first-sync.hbs

@@ -1,3 +1,4 @@
+{{#travis-layout layoutName="layouts/simple"}}
 <div id="first_sync" class="row first-sync">
   <div class="column medium-6 medium-centered">
   {{#if isSyncing}}
@@ -23,3 +24,4 @@
   {{/unless}}
   </div>
 </div>
+{{/travis-layout}}

app/templates/helpers/travis-errors.hbs

@@ -1 +0,0 @@
-{{#each view.errors as |error|}}{{error.message}}{{/each}}

app/templates/home-pro.hbs

@@ -1,3 +1,4 @@
+{{#travis-layout layoutName="layouts/landing-page" class="landing-pro"}}
 <div id="landing" class="landing wrapper">
   <section class="section--hero section--grey">
     <div class="inner">
@@ -89,3 +90,4 @@
     </div>
   </section>
 </div>
+{{/travis-layout}}

app/templates/home.hbs

@@ -1,3 +1,4 @@
+{{#travis-layout layoutName="layouts/landing-page"}}
 <div id="landing" class="landing">
 	<div class="row hero z-1">
 		<div class="landing-centered-wrapper">
@@ -248,3 +249,4 @@
 		</div>
 	</div>
 </div>
+{{/travis-layout}}

app/templates/insufficient-oauth-permissions.hbs

@@ -1,3 +1,4 @@
+{{#travis-layout layoutName="layouts/simple"}}
 <div id="insufficient-permissions">
   <img src="/images/travis-crying.png" class="sad-travis" width="150">
 
@@ -23,3 +24,4 @@
     {{/if}}
   </div>
 </div>
+{{/travis-layout}}

app/templates/job.hbs

@@ -1,3 +1,4 @@
+{{#job-wrapper repo=repo job=job}}
 {{#if job.isLoaded}}
 
   {{build-header item=job user=auth.currentUser commit=job.commit repo=repo}}
@@ -9,3 +10,4 @@
     {{loading-indicator}}
   </div>
 {{/if}}
+{{/job-wrapper}}

app/templates/loading.hbs

@@ -1 +1,3 @@
-{{loading-indicator}}
+{{#travis-layout layoutName=layoutName}}
+  {{loading-indicator}}
+{{/travis-layout}}

app/templates/logo.hbs

@@ -1,3 +1,4 @@
+{{#travis-layout layoutName="layouts/landing-page" class="landing-pro"}}
 <div id="landing" class="landing wrapper">
   <section class="section--white">
     <div class="inner">
@@ -143,3 +144,4 @@
     </div>
   </section>
 </div>
+{{/travis-layout}}

app/templates/main.hbs

@@ -1 +1,3 @@
-{{outlet}}
+{{#travis-layout layoutName="layouts/home" class="main"}}
+  {{outlet}}
+{{/travis-layout}}

app/templates/not-found.hbs

@@ -1 +1,3 @@
-The requested page was not found.
+{{#travis-layout layoutName="layouts/simple"}}
+  The requested page was not found.
+{{/travis-layout}}

app/templates/owner.hbs

@@ -1,3 +1,4 @@
+{{#travis-layout layoutName="layouts/profile" class="owner"}}
 <header class="owner-header row">
   <div class="owner-avatar">
     <img src={{avatarURL}} alt="" width="125" height="125">
@@ -36,3 +37,4 @@
     </section> --}}
   </div>
 </div>
+{{/travis-layout}}

app/templates/plans.hbs

@@ -1,3 +1,4 @@
+{{#travis-layout layoutName="layouts/landing-page" class="landing-pro"}}
 <div id="landing" class="landing wrapper">
   <section class="section--white">
     <div class="inner">
@@ -133,3 +134,4 @@
     </div>
   </section>
 </div>
+{{/travis-layout}}

app/templates/profile-accounts.hbs

@@ -1,3 +1,4 @@
+{{#profile-accounts-wrapper}}
 <section class="profile-orgs">
   <ul>
     {{org-item account=user}}
@@ -18,3 +19,4 @@
       <a href={{config.githubOrgsOauthAccessSettingsUrl}} title="Organizations Oauth Access Settings on GitHub">Review and add</a> your authorized organizations.</p>
   </section>
 {{/if}}
+{{/profile-accounts-wrapper}}

app/templates/profile.hbs

@@ -1,3 +1,5 @@
+{{#travis-layout layoutName="layouts/profile" class="profile-view"}}
 <article class="profile-main">
   {{outlet}}
 </article>
+{{/travis-layout}}

app/templates/repo.hbs

@@ -1,4 +1,5 @@
-{{#if view.isEmpty}}
+{{#repo-wrapper repo=repo isLoading=isLoading}}
+{{#if isEmpty}}
   {{repos-empty}}
 {{else}}
 
@@ -7,11 +8,11 @@
       <header>
         <h1 class="repo-title">{{#link-to "owner" repo.owner}}{{repo.owner}}{{/link-to}} / {{#link-to "repo" repo}}{{repo.name}}{{/link-to}}</h1>
         <div class="repo-gh">
-          <a href="{{controller.urlGithub}}" title="{{repo.name}} on Github">{{repo.name}} on Github</a>
+          <a href="{{urlGithub}}" title="{{repo.name}} on Github">{{repo.name}} on Github</a>
         </div>
         <div class="repo-badge">
-          <a href="#" id="status-image-popup" title="build status image" name="status-images" class="open-popup" {{action "statusImages" target=view}}>
+          <a href="#" id="status-image-popup" title="build status image" name="status-images" class="open-popup" {{action "statusImages"}}>
-            <img src={{view.statusImageUrl}} alt="Build Status Images"/>
+            <img src={{statusImageUrl}} alt="Build Status Images"/>
           </a>
         </div>
       </header>
@@ -39,3 +40,6 @@
     {{loading-indicator}}
   {{/if}}
 {{/if}}
+{{/repo-wrapper}}
+
+{{status-images repo=repo branches=repo.branches}}

app/templates/repos.hbs

@@ -1,10 +1,10 @@
 <div class="search search--sidebar">
   <div class="search-inner">
-    {{input value=controller.search placeholder="Search all repositories"}}
+    {{input value=search placeholder="Search all repositories"}}
   </div>
 </div>
 
-{{view 'repos-list-tabs'}}
+{{repos-list-tabs tab=tab showMyRepositories=(action "showMyRepositories") showRunningJobs=(action "showRunningJobs")}}
 
 {{#if showRunningJobs}}
   <div class="tabbody sidebar-list">

app/templates/signin.hbs

@@ -1,3 +1,4 @@
+{{#travis-layout layoutName="layouts/simple"}}
 {{#if redirected}}
 {{/if}}
 
@@ -14,3 +15,4 @@
     {{/if}}
   </a>
 </p>
+{{/travis-layout}}

app/templates/ssh-key/_form.hbs

@@ -1,16 +0,0 @@
-<form class="ssh-key" {{action "save" on="submit"}}>
-  <div class="field">
-    {{label for="description" content="Description:"}}
-    {{input value=description}}
-  </div>
-  {{#travis-field "value"}}
-    {{label for="value" class="value" content="Private key:"}}
-    {{textarea value=value}} {{travis-errors "value"}}
-  {{/travis-field}}
-
-  <div class="actions">
-    <input type="submit" value="Add" class="submit-ssh-key {{if isSaving 'saving'}}" {{if isSaving 'dsabled="disabled"'}} />
-    <span class="or">or</span>
-    <a href="#" class="cancel-ssh-key" {{action "cancel"}}>Cancel</a>
-  </div>
-</form>

app/templates/status-images.hbs

@@ -1,14 +0,0 @@
-<a href="#" class="close" {{action "close" target=view}}></a>
-<p>
-  <label>Branch:</label>
-  {{#if view.branches.isLoaded}}
-    {{view Ember.Select content=view.branches selection=view.statusImageBranch optionLabelPath="content.commit.branch" optionValuePath="content.commit.branch"}}
-  {{else}}
-    {{loading-indicator}}
-  {{/if}}
-</p>
-
-<p>
-  <label>{{view Ember.Select content=view.formats selection=view.statusImageFormat}}</label>
-  {{view 'status-image-input' value=view.statusString class="url" rows=3}}
-</p>

app/templates/team.hbs

@@ -1,3 +1,4 @@
+{{#travis-layout layoutName="layouts/landing-page" class="landing-pro"}}
 <div id="landing" class="landing wrapper">
   <section class="section--white">
     <div class="inner">
@@ -14,3 +15,4 @@
     </div>
   </section>
 </div>
+{{/travis-layout}}

app/templates/top.hbs

@@ -51,7 +51,7 @@
         {{/unless}}
       {{/if}}
 
-      <li class="{{view.classProfile}}">
+      <li class="{{classProfile}}">
         {{#if auth.signedOut}}
           <button class="signed-out button--signin" {{action "signIn" target="auth"}}>Sign in with GitHub</button>
         {{/if}}

app/utils/computed-limit.js

@@ -1,30 +1,12 @@
 import Ember from 'ember';
 
 var limit = function(dependentKey, limitKey) {
-  var options = {
+  return Ember.computed(dependentKey, dependentKey + ".[]", function() {
-    addedItem: function(array, item, changeMeta) {
+    var limit = Ember.get(this, limitKey),
-      var limit = Ember.get(this, limitKey);
+        array = this.get(dependentKey);
-      if (changeMeta.index < limit) {
+
-        array.insertAt(changeMeta.index, item);
+    return array.toArray().slice(0, limit);
-        if (Ember.get(array, "length") > limit) {
+  });
-          array.popObject();
-        }
-      }
-      return array;
-    },
-    removedItem: function(array, item, changeMeta) {
-      var limit = Ember.get(this, limitKey);
-      if (changeMeta.index < limit && changeMeta.index < Ember.get(array, 'length')) {
-        array.removeAt(changeMeta.index, 1);
-        var toPush = changeMeta.arrayChanged.objectAt(limit);
-        if (toPush) {
-          array.pushObject(toPush);
-        }
-      }
-      return array;
-    }
-  };
-  return Ember.arrayComputed(dependentKey, limitKey, options);
 };
 
 export default limit;

app/utils/status-image-formats.js

@@ -57,4 +57,5 @@ format = function(version, slug, branch) {
   }
 };
 
+export { format };
 export default format;

app/utils/test-auth.js

@@ -13,7 +13,7 @@ export default Ember.Object.extend({
 
   signInForTests(user) {
     this.set('state', 'signed-in');
-    if ((user.constructor.typeKey != null) !== 'user') {
+    if ((user.constructor.modelName != null) !== 'user') {
       this.store.push({
         data: {
           type: 'user',

app/views/accounts-info.js

@@ -1,10 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend({
-  templateName: 'profile/tabs/user',
-  userBinding: 'controller.user',
-
-  gravatarUrl: function() {
-    return location.protocol + "//www.gravatar.com/avatar/" + (this.get('user.gravatarId')) + "?s=200&d=mm";
-  }.property('user.gravatarId')
-});

app/views/application/loading.js

@@ -1,3 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend();

app/views/auth/signin.js

@@ -1,5 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.View.extend({
-  layoutName: 'layouts/simple'
-});

app/views/basic.js

@@ -1,3 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.View.extend();

app/views/dashboard.js

@@ -1,6 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.View.extend({
-  layoutName: 'layouts/dashboard',
-  classNames: ['dashboard']
-});

app/views/dashboard/loading.js

@@ -1,3 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.View.extend();

app/views/error.js

@@ -1,10 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.View.extend({
-  layoutName: function() {
-    var name;
-    if (name = this.get('controller.layoutName')) {
-      return 'layouts/' + name;
-    }
-  }.property('controller.layoutName')
-});

app/views/error404.js

@@ -1,6 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend({
-  layoutName: 'layouts/error',
-  classNames: ['error error404']
-});

app/views/first-sync.js

@@ -1,5 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend({
-  layoutName: 'layouts/simple'
-});

app/views/home-pro.js

@@ -1,6 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend({
-  classNames: ['landing-pro'],
-  layoutName: 'layouts/landing-page'
-});

app/views/home.js

@@ -1,5 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend({
-  layoutName: 'layouts/landing-page'
-});

app/views/hooks.js

@@ -1,11 +0,0 @@
-import BasicView from 'travis/views/basic';
-import { githubAdmin as githubAdminUrl } from 'travis/utils/urls';
-
-export default BasicView.extend({
-  templateName: 'profile/tabs/hooks',
-  userBinding: 'controller.user',
-
-  urlGithubAdmin: function() {
-    return githubAdminUrl(this.get('hook.slug'));
-  }.property('hook.slug')
-});

app/views/insufficient-oauth-permissions.js

@@ -1,5 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend({
-  layoutName: 'layouts/simple'
-});

app/views/loading.js

@@ -1,10 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.View.extend({
-  layoutName: (function() {
-    var name;
-    if (name = this.get('controller.layoutName')) {
-      return 'layouts/' + name;
-    }
-  }).property('controller.layoutName')
-});

app/views/logo.js

@@ -1,6 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend({
-  classNames: ['landing-pro'],
-  layoutName: 'layouts/landing-page'
-});

app/views/main.js

@@ -1,6 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.View.extend({
-  layoutName: 'layouts/home',
-  classNames: ['main']
-});

app/views/not-found.js

@@ -1,5 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.View.extend({
-  layoutName: 'layouts/simple'
-});

app/views/owner.js

@@ -1,6 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.View.extend({
-  layoutName: 'layouts/profile',
-  classNames: ['owner']
-});

app/views/plans.js

@@ -1,6 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend({
-  classNames: ['landing-pro'],
-  layoutName: 'layouts/landing-page'
-});

app/views/profile-accounts.js

@@ -1,8 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend({
-  tabBinding: 'controller.tab',
-  classNames: ['profile-orglist', 'columns', 'medium-4'],
-  tagName: 'aside',
-  templateName: 'profile/accounts'
-});

app/views/profile-tabs.js

@@ -1,21 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend({
-  templateName: 'profile/tabs',
-  tabBinding: 'controller.tab',
-  activate() {
-    return this.get('controller').activate(event.target.name);
-  },
-
-  classHooks: function() {
-    return this.get('tab') === 'hooks' ? 'active' : null;
-  }.property('tab'),
-
-  classUser: function() {
-    return this.get('tab') === 'user' ? 'active' : null;
-  }.property('tab'),
-
-  displayUser: function() {
-    return this.get('controller.account.login') === this.get('controller.user.login');
-  }.property('controller.account.login', 'controller.user.login')
-});

app/views/profile.js

@@ -1,12 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend({
-  templateName: 'profile/show',
-  layoutName: 'layouts/profile',
-  classNames: ['profile-view'],
-  accountBinding: 'controller.account',
-
-  name: function() {
-    return this.get('account.name') || this.get('account.login');
-  }.property('account.name', 'account.login')
-});

app/views/repo-show-tabs.js

@@ -1,56 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.View.extend({
-  templateName: 'repos/show/tabs',
-  tabBinding: 'controller.tab',
-  contextBinding: 'controller',
-
-  classCurrent: function() {
-    return this.get('tab') === 'current' ? 'active' : null;
-  }.property('tab'),
-
-  classBuilds: function() {
-    return this.get('tab') === 'builds' ? 'active' : null;
-  }.property('tab'),
-
-  classPullRequests: function() {
-    return this.get('tab') === 'pull_requests' ? 'active' : null;
-  }.property('tab'),
-
-  classBranches: function() {
-    return this.get('tab') === 'branches' ? 'active' : null;
-  }.property('tab'),
-
-  classBuild: function() {
-    var classes, tab;
-    tab = this.get('tab');
-    classes = [];
-    if (tab === 'build') {
-      classes.push('active');
-    }
-    if (tab === 'build' || tab === 'job') {
-      classes.push('display-inline');
-    }
-    return classes.join(' ');
-  }.property('tab'),
-
-  classJob: function() {
-    return this.get('tab') === 'job' ? 'active' : null;
-  }.property('tab'),
-
-  classRequests: function() {
-    return this.get('tab') === 'requests' ? 'active' : null;
-  }.property('tab'),
-
-  classCaches: function() {
-    return this.get('tab') === 'caches' ? 'active' : null;
-  }.property('tab'),
-
-  classSettings: function() {
-    return this.get('tab') === 'settings' ? 'active' : null;
-  }.property('tab'),
-
-  classRequest: function() {
-    return this.get('tab') === 'request' ? 'active' : null;
-  }.property('tab')
-});

app/views/repo.js

@@ -1,39 +0,0 @@
-import { statusImage } from 'travis/utils/urls';
-import StatusImagesView from 'travis/views/status-images';
-import BasicView from 'travis/views/basic';
-import config from 'travis/config/environment';
-import Polling from 'travis/mixins/polling';
-import Ember from 'ember';
-
-export default BasicView.extend(Polling, {
-  popup: Ember.inject.service(),
-  reposBinding: 'reposController',
-  repoBinding: 'controller.repo',
-  buildBinding: 'controller.build',
-  jobBinding: 'controller.job',
-  tabBinding: 'controller.tab',
-  pollModels: 'controller.repo',
-  classNameBindings: ['controller.isLoading:loading'],
-
-  isEmpty: function() {
-    return this.get('repos.isLoaded') && this.get('repos.length') === 0;
-  }.property('repos.isLoaded', 'repos.length'),
-
-  statusImageUrl: function() {
-    return statusImage(this.get('controller.repo.slug'));
-  }.property('controller.repo.slug'),
-
-  actions: {
-    statusImages() {
-      var view;
-      this.get('popup').close();
-      view = StatusImagesView.create({
-        toolsView: this,
-        container: this.container
-      });
-      BasicView.currentPopupView = view;
-      view.appendTo($('body'));
-      return false;
-    }
-  }
-});

app/views/repos-list.js

@@ -1,39 +0,0 @@
-import Ember from 'ember';
-import { colorForState } from 'travis/utils/helpers';
-import Polling from 'travis/mixins/polling';
-
-export default Ember.CollectionView.extend({
-  elementId: '',
-  tagName: 'ul',
-  emptyView: Ember.View.extend({
-    templateName: 'repos-list/empty'
-  }),
-
-  itemViewClass: Ember.View.extend(Polling, {
-    pollModels: 'repo',
-    repoBinding: 'content',
-    classNames: ['repo'],
-    classNameBindings: ['color', 'selected'],
-
-    selected: function() {
-      return this.get('content') === this.get('controller.selectedRepo');
-    }.property('controller.selectedRepo'),
-
-    color: function() {
-      return colorForState(this.get('repo.lastBuildState'));
-    }.property('repo.lastBuildState'),
-
-    scrollTop() {
-      if (window.scrollY > 0) {
-        return $('html, body').animate({
-          scrollTop: 0
-        }, 200);
-      }
-    },
-
-    click() {
-      this.scrollTop();
-      return this.get('controller').transitionToRoute('/' + this.get('repo.slug'));
-    }
-  })
-});

app/views/signin.js

@@ -1,5 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend({
-  templateName: 'auth/signin'
-});

app/views/status-images.js

@@ -1,43 +0,0 @@
-import Ember from 'ember';
-import format from 'travis/utils/status-image-formats';
-
-export default Ember.View.extend({
-  templateName: 'status_images',
-  classNames: ['popup', 'status-images'],
-  classNameBindings: ['display'],
-  repoBinding: 'toolsView.repo',
-  buildBinding: 'toolsView.build',
-  jobBinding: 'toolsView.job',
-  branchesBinding: 'repo.branches',
-  formats: ['Image URL', 'Markdown', 'Textile', 'Rdoc', 'AsciiDoc', 'RST', 'Pod', 'CCTray'],
-
-  didInsertElement() {
-    this._super(...arguments);
-    this.setStatusImageBranch();
-    this.setStatusImageFormat();
-    this.show();
-  },
-
-  show() {
-    return this.set('display', true);
-  },
-
-  actions: {
-    close() {
-      return this.destroy();
-    }
-  },
-
-  setStatusImageFormat: (function() {
-    this.set('statusImageFormat', this.formats[0]);
-  }),
-
-  setStatusImageBranch: function() {
-    var branch = this.get('repo.branches').findProperty('commit.branch', this.get('build.commit.branch'));
-    this.set('statusImageBranch', branch);
-  }.observes('repo.branches', 'repo.branches.isLoaded', 'build.commit.branch'),
-
-  statusString: function() {
-    return format(this.get('statusImageFormat'), this.get('repo.slug'), this.get('statusImageBranch.commit.branch'));
-  }.property('statusImageFormat', 'repo.slug', 'statusImageBranch.commit.branch')
-});

app/views/team.js

@@ -1,6 +0,0 @@
-import BasicView from 'travis/views/basic';
-
-export default BasicView.extend({
-  classNames: ['landing-pro'],
-  layoutName: 'layouts/landing-page'
-});

app/views/top.js

@@ -1,36 +0,0 @@
-import BasicView from 'travis/views/basic';
-var View;
-
-View = BasicView.extend({
-  tabBinding: 'controller.tab',
-
-  classHome: function() {
-    return this.get('tab') === 'home' ? 'active' : null;
-  }.property('tab'),
-
-  classStats: function() {
-    return this.get('tab') === 'stats' ? 'active' : null;
-  }.property('tab'),
-
-  classProfile: function() {
-    var classes = ['profile menu'];
-
-    if (this.get('tab') === 'profile') {
-      classes.push('active');
-    }
-
-    classes.push(this.get('controller.auth.state') || 'signed-out');
-
-    return classes.join(' ');
-  }.property('tab', 'controller.auth.state'),
-
-  showProfile() {
-    $('#top .profile ul').show();
-  },
-
-  hideProfile() {
-    $('#top .profile ul').hide();
-  }
-});
-
-export default View;

config/deprecation-workflow.js

@@ -1,22 +1,26 @@
 window.deprecationWorkflow = window.deprecationWorkflow || {};
 window.deprecationWorkflow.config = {
   workflow: [
-    { handler: "silence", matchMessage: "Ember.LinkView is deprecated. Please use Ember.LinkComponent." },
+    // DONE
-    { handler: "silence", matchMessage: "Calling store.find() with a query object is deprecated. Use store.query() instead." },
+    { handler: "log", matchMessage: "Ember.LinkView is deprecated. Please use Ember.LinkComponent." },
-    { handler: "silence", matchMessage: "Ember.View is deprecated. Consult the Deprecations Guide for a migration strategy." },
+    { handler: "log", matchMessage: "Calling store.find() with a query object is deprecated. Use store.query() instead." },
-    { handler: "silence", matchMessage: "Ember.arrayComputed is deprecated. Replace it with plain array methods" },
+    { handler: "log", matchMessage: new RegExp("A property of .*? was modified inside the didInsertElement hook. You should never change properties on components, services or models during didInsertElement because it causes significant performance degradation.") },
-    { handler: "silence", matchMessage: "The filter API will be moved into a plugin soon. To enable store.filter using an environment flag, or to use an alternative, you can visit the ember-data-filter addon page" },
+    { handler: "log", matchMessage: "Ember.arrayComputed is deprecated. Replace it with plain array methods" },
-    { handler: "silence", matchMessage: "Usage of `state` is deprecated, use `_state` instead." },
+    // this will still emit deprecations, because we use state property in
-    { handler: "silence", matchMessage: "Function#observesBefore is deprecated and will be removed in the near future." },
+    // request-icon compoenent, that makes Ember.js think that we're using
-    { handler: "silence", matchMessage: "Ember.addBeforeObserver is deprecated and will be removed in the near future." },
+    // internal component's state
-    { handler: "silence", matchMessage: "`Ember.ArrayController` is deprecated." },
+    { handler: "log", matchMessage: "Usage of `state` is deprecated, use `_state` instead." },
-    { handler: "silence", matchMessage: "Ember.removeBeforeObserver is deprecated and will be removed in the near future." },
+    { handler: "log", matchMessage: "RestAdapter#find has been deprecated and renamed to `findRecord`." },
-    { handler: "silence", matchMessage: "The default behavior of `shouldBackgroundReloadRecord` will change in Ember Data 2.0 to always return true. If you would like to preserve the current behavior please override `shouldBackgroundReloadRecord` in your adapter:application and return false." },
+    { handler: "log", matchMessage: "Usage of `typeKey` has been deprecated and will be removed in Ember Data 2.0. It has been replaced by `modelName` on the model class." },
-    { handler: "silence", matchMessage: "RestAdapter#find has been deprecated and renamed to `findRecord`." },
+    { handler: "log", matchMessage: "Using store.dematerializeRecord() has been deprecated since it was intended for private use only. You should use store.unloadRecord() instead." },
-    { handler: "silence", matchMessage: "Using the same function as getter and setter is deprecated." },
+    { handler: "log", matchMessage: "Using the same function as getter and setter is deprecated." },
-    { handler: "silence", matchMessage: "Using store.dematerializeRecord() has been deprecated since it was intended for private use only. You should use store.unloadRecord() instead." },
+    { handler: "log", matchMessage: "`Ember.ArrayController` is deprecated." },
-    { handler: "silence", matchMessage: "A property of <travis@view:-outlet::ember607> was modified inside the didInsertElement hook. You should never change properties on components, services or models during didInsertElement because it causes significant performance degradation." },
+    { handler: "log", matchMessage: "The default behavior of `shouldBackgroundReloadRecord` will change in Ember Data 2.0 to always return true. If you would like to preserve the current behavior please override `shouldBackgroundReloadRecord` in your adapter:application and return false." },
-    { handler: "silence", matchMessage: "Using DS.Snapshot.get() is deprecated. Use .attr(), .belongsTo() or .hasMany() instead." },
+    { handler: "log", matchMessage: "Function#observesBefore is deprecated and will be removed in the near future." },
-    { handler: "silence", matchMessage: "Usage of `typeKey` has been deprecated and will be removed in Ember Data 2.0. It has been replaced by `modelName` on the model class." }
+    { handler: "log", matchMessage: "Ember.addBeforeObserver is deprecated and will be removed in the near future." },
+    { handler: "log", matchMessage: "Ember.removeBeforeObserver is deprecated and will be removed in the near future." },
+    { handler: "log", matchMessage: "Using DS.Snapshot.get() is deprecated. Use .attr(), .belongsTo() or .hasMany() instead." },
+    { handler: "log", matchMessage: "The filter API will be moved into a plugin soon. To enable store.filter using an environment flag, or to use an alternative, you can visit the ember-data-filter addon page" },
+    { handler: "log", matchMessage: "Ember.View is deprecated. Consult the Deprecations Guide for a migration strategy." },
   ]
 };

package.json

@@ -39,8 +39,10 @@
     "ember-cli-sauce": "^1.1.0",
     "ember-cli-uglify": "1.2.0",
     "ember-data": "1.13.15",
+    "ember-data-filter": "1.13.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",
-    "ember-try": "0.0.7"
+    "ember-try": "0.0.7",
+    "emberx-select": "2.0.2"
   }
 }

tests/.jshintrc

@@ -33,6 +33,7 @@
     "exists",
     "fillIn",
     "click",
+    "select",
     "keyEvent",
     "triggerEvent",
     "find",

tests/test-helper.js

@@ -1,4 +1,6 @@
 import resolver from './helpers/resolver';
+import registerSelectHelper from './helpers/register-select-helper';
+registerSelectHelper();
 import {
   setResolver
 } from 'ember-qunit';