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

Conflicts:
	Gemfile.lock
	assets/javascripts/app/app.coffee
	assets/javascripts/app/auth.coffee
	assets/javascripts/app/store/rest_adapter.coffee
	public/javascripts/application.js
	public/stylesheets/application.css

Gemfile

@@ -1,8 +1,9 @@
 source :rubygems
 
-gem 'travis-api',     github: 'travis-ci/travis-api', branch: 'sf-use-services'
+gem 'travis-api',     github: 'travis-ci/travis-api'
 gem 'travis-core',    github: 'travis-ci/travis-core', branch: 'sf-more-services'
 gem 'travis-support', github: 'travis-ci/travis-support'
+gem 'gh',             github: 'rkh/gh'
 
 gem 'unicorn'
 gem 'sinatra'

Gemfile.lock

@@ -6,6 +6,18 @@ GIT
       rake (~> 0.9.0)
       thor
 
+GIT
+  remote: git://github.com/rkh/gh.git
+  revision: affde20a4fecb1023f2e7031734b9386a76d22c2
+  specs:
+    gh (0.8.0)
+      addressable
+      backports (~> 2.3)
+      faraday (~> 0.8)
+      multi_json (~> 1.0)
+      net-http-persistent (>= 2.7)
+      net-http-pipeline
+
 GIT
   remote: git://github.com/rkh/yard-sinatra.git
   revision: 3b1064eef407d2d288a5b96d258178a1e67b3b80
@@ -23,7 +35,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-api.git
-  revision: d887f01e0b27bb2936bcfd929258eec92b76a9b2
+  revision: 05c44dce448cbf3f91c37a91841c2094b309e01e
   branch: sf-use-services
   specs:
     travis-api (0.0.1)
@@ -130,13 +142,6 @@ GEM
     faraday (0.8.4)
       multipart-post (~> 1.1)
     fssm (0.2.9)
-    gh (0.8.0)
-      addressable
-      backports (~> 2.3)
-      faraday (~> 0.8)
-      multi_json (~> 1.0)
-      net-http-persistent (>= 2.7)
-      net-http-pipeline
     guard (1.3.3)
       listen (>= 0.4.2)
       thor (>= 0.14.6)
@@ -242,6 +247,7 @@ DEPENDENCIES
   bunny
   coffee-script
   compass
+  gh!
   guard
   hubble!
   newrelic_rpm (~> 3.3.0)

Procfile

@@ -1,3 +1,3 @@
-web: RUN_API=1 bundle exec unicorn -p $PORT -c ./unicorn.rb
+web: bundle exec unicorn -p $PORT -c ./unicorn.rb
 guard: bundle exec guard
 rerun: rerun -p 'assets/**/*' 'bundle exec rakep'

assets/javascripts/app/auth.coffee

@@ -2,6 +2,7 @@
   iframe: $('<iframe id="auth-frame" />').hide()
   timeout: 5000
   state: 'signed-out'
+  receivingEnd: "#{location.protocol}//#{location.host}"
 
   init: ->
     @iframe.appendTo('body')
@@ -18,12 +19,12 @@
 
   # try signing in, but check later in case we have a timeout
   signIn: ->
-    @set('state', 'signing-in')
     @trySignIn()
     Ember.run.later(this, @checkSignIn.bind(this), @timeout)
 
   trySignIn: ->
-    @iframe.attr('src', "#{@endpoint}/auth/post_message")
+    @set('state', 'signing-in')
+    @iframe.attr('src', "#{@endpoint}/auth/post_message?origin=#{@receivingEnd}")
 
   checkSignIn: ->
     @forceSignIn() if @get('state') == 'signing-in'
@@ -60,4 +61,4 @@
       console.log("unexpected message #{event.origin}: #{event.data}")
 
   expectedOrigin: ->
-    if @endpoint[0] == '/' then "#{location.protocol}//#{location.host}" else @endpoint
+    if @endpoint[0] == '/' then @receivingEnd else @endpoint

config.ru

@@ -1,10 +1,10 @@
 require 'travis'
 require 'travis/api/app'
 
-env, api_endpoint, client_endpoint, run_api, watch = ENV.values_at('RACK_ENV', 'API_ENDPOINT', 'CLIENT_ENDPOINT', 'RUN_API', 'WATCH', 'DEFLATE')
+env, api_endpoint, client_endpoint, run_api, watch, deflate = ENV.values_at('RACK_ENV', 'API_ENDPOINT', 'CLIENT_ENDPOINT', 'RUN_API', 'WATCH', 'DEFLATE')
 
 env             ||= "development"
-endpoint        ||= "https://api.#{Travis.config.host}" if env == "production"
+api_endpoint    ||= "https://api.#{Travis.config.host}" if env == "production"
 run_api         ||= ["development", "test"].include? env
 api_endpoint    ||= "/api" if run_api and run_api != '0'
 client_endpoint ||= "/"