Merge branch 'master' into new-build-header

2015-03-11 13:05:43 +01:00 · 2015-03-11 13:05:43 +01:00 · 436fd7e923
commit 436fd7e923
parent 2194052a35 2b3b3adf5f
5 changed files with 5 additions and 184011 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,3 +13,6 @@ coverage/*
 libpeerconnection.log
 npm-debug.log
 testem.log
+
+# files generated by older build tools
+public/scripts
--- a/app/views/jobs.coffee
+++ b/app/views/jobs.coffee
@ -1,6 +1,7 @@
 `import Ember from 'ember'`
+`import BasicView from 'travis/views/basic'`

-View = Ember.View.extend
+View = BasicView.extend
  templateName: 'jobs'
  buildBinding: 'controller.build'

--- a/public/scripts/app.js
+++ b/public/scripts/app.js
--- a/public/scripts/min/app.js
+++ b/public/scripts/min/app.js
--- a/public/scripts/specs.js
+++ b/public/scripts/specs.js