Merge branch 'master' into hh-annotations

Conflicts:
	assets/scripts/app/controllers/job.coffee
	assets/scripts/app/models/job.coffee

.gitignore

@@ -8,3 +8,4 @@
 .localeapp/key
 /assets/scripts/config/locales.js
 .DS_Store
+/public/images/emoji

.travis.yml

@@ -11,8 +11,8 @@ env:
   matrix:
     - "TEST_SUITE=ruby ARTIFACTS_S3_BUCKET=travis-web-production"
     - "TEST_SUITE=phantomjs"
-    - "TEST_SUITE=saucelabs BROWSER='firefox:19:Windows 2012'"
-    - "TEST_SUITE=saucelabs BROWSER='chrome::Windows 2008'"
+    - "TEST_SUITE=saucelabs BROWSER='firefox::Windows XP'"
+    - "TEST_SUITE=saucelabs BROWSER='chrome::Windows XP'"
 script: "script/ci"
 
 before_script:

Assetfile

@@ -31,10 +31,15 @@ input assets.scripts do
   end
 
   match 'vendor/**/*.js' do
+    if assets.production?
+      reject 'ember.js'
+    else
+      reject 'ember.prod.js'
+    end
     safe_concat assets.vendor_order, 'vendor.js'
   end
 
-  match '{spec,spec/unit,spec/unit/views}/*.js' do
+  match '{spec,spec/integration,spec/unit,spec/unit/views}/*.js' do
     concat 'spec/specs.js'
   end
 

Gemfile

@@ -17,12 +17,12 @@ group :assets do
   gem 'tilt'
   gem 'uglifier'
   gem 'yui-compressor'
+  gem 'libv8', '~> 3.16.0'
 end
 
 group :development, :test do
   gem 'rake'
   gem 'localeapp'
-  gem 'handlebars'
   gem 'localeapp-handlebars_i18n'
 end
 
@@ -40,61 +40,3 @@ group :test do
   gem 'sinatra-contrib'
 end
 
-require 'bundler/installer'
-
-module ::Bundler
-  class Installer < Environment
-    MAX_RETRIES = 3
-
-    def install_gem_from_spec(spec, standalone = false)
-      retries = 1
-      # Download the gem to get the spec, because some specs that are returned
-      # by rubygems.org are broken and wrong.
-      Bundler::Fetcher.fetch(spec) if spec.source.is_a?(Bundler::Source::Rubygems)
-
-      # Fetch the build settings, if there are any
-      settings = Bundler.settings["build.#{spec.name}"]
-      Bundler.rubygems.with_build_args [settings] do
-        spec.source.install(spec)
-        Bundler.ui.debug "from #{spec.loaded_from} "
-      end
-
-      # newline comes after installing, some gems say "with native extensions"
-      Bundler.ui.info ""
-      if Bundler.settings[:bin] && standalone
-        generate_standalone_bundler_executable_stubs(spec)
-      elsif Bundler.settings[:bin]
-        generate_bundler_executable_stubs(spec, :force => true)
-      end
-
-      FileUtils.rm_rf(Bundler.tmp)
-    rescue Gem::RemoteFetcher::FetchError => e
-      if retries <= MAX_RETRIES
-        Bundler.ui.warn "#{e.class}: #{e.message}"
-        Bundler.ui.warn "Installing #{spec.name} (#{spec.version}) failed."
-        Bundler.ui.warn "Retrying (#{retries}/#{MAX_RETRIES})"
-        retries += 1
-        sleep retries
-        retry
-      else
-        Bundler.ui.warn "Installing #{spec.name} (#{spec.version}) failed after #{retries} retries: #{e.message}."
-        Bundler.ui.warn "Giving up"
-        msg = "An error, most likely because of network issues, has occurred trying to install #{spec.name} (#{spec.version}), "
-        msg << "and Bundler cannot continue."
-        raise Bundler::InstallError, msg
-      end
-    rescue Exception => e
-      # install hook failed
-      raise e if e.is_a?(Bundler::InstallHookError) || e.is_a?(Bundler::SecurityError)
-
-      # other failure, likely a native extension build failure
-      Bundler.ui.info ""
-      Bundler.ui.warn "#{e.class}: #{e.message}"
-      msg = "An error occurred while installing #{spec.name} (#{spec.version}),"
-      msg << " and Bundler cannot continue.\nMake sure that `gem install"
-      msg << " #{spec.name} -v '#{spec.version}'` succeeds before bundling."
-      Bundler.ui.debug e.backtrace.join("\n")
-      raise Bundler::InstallError, msg
-    end
-  end
-end

Gemfile.lock

@@ -29,7 +29,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.5.0)
-    commonjs (0.2.6)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -48,12 +47,9 @@ GEM
       pry (>= 0.9.10)
       terminal-table (>= 1.4.3)
       thor (>= 0.14.6)
-    handlebars (0.4.0)
-      commonjs (~> 0.2.3)
-      therubyracer (~> 0.11.1)
     i18n (0.6.3)
     json (1.7.7)
-    libv8 (3.11.8.13)
+    libv8 (3.16.14.3)
     listen (0.7.3)
     localeapp (0.6.9)
       gli
@@ -72,8 +68,8 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    puma (1.6.3)
-      rack (~> 1.2)
+    puma (2.6.0)
+      rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -89,7 +85,6 @@ GEM
     rake-pipeline-i18n-filters (0.0.5)
       rake-pipeline (~> 0.6)
     rb-fsevent (0.9.3)
-    ref (1.0.2)
     rerun (0.8.0)
       listen
     rest-client (1.6.7)
@@ -116,9 +111,6 @@ GEM
       tilt (~> 1.3)
     slop (3.4.3)
     terminal-table (1.4.5)
-    therubyracer (0.11.4)
-      libv8 (~> 3.11.8.12)
-      ref
     thor (0.17.0)
     tilt (1.3.3)
     uglifier (1.3.0)
@@ -136,7 +128,7 @@ DEPENDENCIES
   compass
   foreman
   guard
-  handlebars
+  libv8 (~> 3.16.0)
   localeapp
   localeapp-handlebars_i18n
   puma

NOTES.txt

@@ -10,7 +10,7 @@
 
 # Handlebars
 
-* Can't {{bindAttr}} be just {{attr}}? Who cares it's "bound" in that context?
+* Can't {{bind-attr}} be just {{attr}}? Who cares it's "bound" in that context?
   {{#each}} isn't {{#bindEach}} either.
 
 * Why is {{#collection contentBinding="foo"}} not just {{#collection foo}}?

README.md

@@ -1,5 +1,5 @@
 ## Travis CI ember web client
-[![Build Status](https://travis-ci.org/travis-ci/travis-web.png)](https://travis-ci.org/travis-ci/travis-web)
+[![Build Status](https://travis-ci.org/travis-ci/travis-web.png?branch=master)](https://travis-ci.org/travis-ci/travis-web)
 ### Running the app
 
 In order to run the app you need to install dependencies with:

Rakefile

@@ -28,3 +28,9 @@ namespace :ember do
     system 'cp tmp/ember.js/dist/ember.js assets/javascripts/vendor/ember.js'
   end
 end
+
+task :update_emojis do
+  s = Dir.glob('assets/images/emoji/*.png').map {|png| png.split('/', 4)[3].gsub('.png', '')}.map{|png| "'#{png}'"}.join(", ")
+  e = "@EmojiDictionary = [#{s}]"
+  File.open("assets/scripts/config/emoij.coffee", "w") {|f| f.write(e) }
+end