Merge branch 'master' of github.com:travis-ci/travis-web

Conflicts:
	public/version

Gemfile.lock

@@ -18,6 +18,7 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
+    backports (2.6.4)
     chunky_png (1.2.6)
     coffee-script (2.2.0)
       coffee-script-source
@@ -35,6 +36,8 @@ GEM
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
     debugger-ruby_core_source (1.1.4)
+    diff-lcs (1.1.3)
+    eventmachine (1.0.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
     foreman (0.60.2)
@@ -54,15 +57,32 @@ GEM
       rack
     rack-ssl (1.3.2)
       rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
     rake (0.9.2.2)
     rb-fsevent (0.9.2)
     rerun (0.7.1)
       listen
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
     sass (3.2.1)
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
+    sinatra-contrib (1.3.1)
+      backports (>= 2.0)
+      eventmachine
+      rack-protection
+      rack-test
+      sinatra (~> 1.3.0)
+      tilt (~> 1.3)
     thor (0.16.0)
     tilt (1.3.3)
     uglifier (1.3.0)
@@ -86,6 +106,8 @@ DEPENDENCIES
   rake-pipeline-web-filters!
   rb-fsevent (~> 0.9.1)
   rerun
+  rspec (~> 2.11)
   sinatra
+  sinatra-contrib
   tilt
   uglifier

assets/scripts/app/routes.coffee

@@ -41,7 +41,10 @@ Travis.Router = Ember.Router.extend
   reload: ->
     url = @get('location').getURL()
     @transitionTo('loading')
-    @route(url)
+    # Without ember next @route sometimes hit the place where HistoryLocation
+    # does not have any state set up yet, so it's best to defer it a little bit.
+    Ember.run.next this, ->
+      @route(url)
 
   signedIn: ->
     !!Travis.app.get('auth.user')

public/version

@@ -1 +1 @@
-0433d9cf
+3f335268