Merge branch 'master' into jc-v3-logs

.buildpacks

@@ -1,3 +1,2 @@
 https://github.com/heroku/heroku-buildpack-ruby.git
-https://github.com/drogus/last-commit-sha-buildpack.git
 https://github.com/ryandotsmith/nginx-buildpack.git

lib/travis/api/app.rb

@@ -26,6 +26,7 @@ require 'metriks/reporter/logger'
 require 'metriks/librato_metrics_reporter'
 require 'travis/support/log_subscriber/active_record_metrics'
 require 'fileutils'
+require 'securerandom'
 
 module Travis::Api
 end
@@ -81,11 +82,7 @@ module Travis::Api
     end
 
     def self.deploy_sha
-      @deploy_sha ||= File.exist?(deploy_sha_path) ? File.read(deploy_sha_path)[0..7] : 'deploy-sha'
+      @deploy_sha ||= ENV['HEROKU_SLUG_COMMIT'] || SecureRandom.hex(5)
-    end
-
-    def self.deploy_sha_path
-      File.expand_path('../../../../.deploy-sha', __FILE__)
     end
 
     attr_accessor :app

lib/travis/api/app/endpoint/authorization.rb

@@ -179,7 +179,8 @@ class Travis::Api::App
             :created_at => user.created_at.to_i,
             :github_id => user.github_id,
             :education => user.education,
-            :first_logged_in_at => user.first_logged_in_at.to_i
+            :first_logged_in_at => user.first_logged_in_at.to_i,
+            :travis_domain => Travis.config.client_domain
           }
 
           customerio.identify(payload)