From bda2797f0e9e47f6fa2d9454ae2e61b6259d3c29 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Mon, 16 Sep 2013 16:43:03 +0200
Subject: [PATCH] bump core and support. Travis::Metrics.setup

---
 Gemfile               |  4 ++--
 Gemfile.lock          | 28 ++++++++++++++++------------
 lib/travis/api/app.rb |  2 ++
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9b90c46d..9e0172f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,8 +3,8 @@ ruby '2.1.2'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core', ref: 'master-2014-10-06'
-gem 'travis-support',  github: 'travis-ci/travis-support', ref: 'master-2014-10-06'
+gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'sf-te'
+gem 'travis-support',  github: 'travis-ci/travis-support', branch: 'sf-te'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
 gem 'travis-yaml',     github: 'travis-ci/travis-yaml'
 gem 'sinatra'
diff --git a/Gemfile.lock b/Gemfile.lock
index 32bd5a4c..49c765e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,7 +37,8 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 35f690bfb12bb0bef90297783e7c7ab15048dfc0
+  revision: 89b65f97ef0ffd00dd36ba38645034c8bcc0e250
+  branch: sf-te
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
@@ -48,8 +49,8 @@ GIT
       hashr (~> 0.0.19)
       metriks (~> 0.9.7)
       multi_json
-      pusher (~> 0.11.0)
-      railties (~> 3.2.19)
+      pusher (~> 0.12.0)
+      railties (~> 3.2.12)
       rake
       redis (~> 3.0)
       rollout (~> 1.1.0)
@@ -68,8 +69,8 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-support.git
-  revision: a3af474254c8d2a5c829ce4be11ca53941361974
-  ref: master-2014-10-06
+  revision: 243147664e49a168b0c2d3c40c04a786bf664f37
+  branch: sf-te
   specs:
     travis-support (0.0.1)
 
@@ -183,9 +184,9 @@ GEM
     hashie (3.1.0)
     hashr (0.0.22)
     hike (1.2.3)
-    hitimes (1.2.2)
-    i18n (0.6.11)
-    ice_nine (0.11.0)
+    hitimes (1.2.1)
+    httpclient (2.3.4.1)
+    i18n (0.6.5)
     journey (1.0.4)
     json (1.8.1)
     kgio (2.9.2)
@@ -206,9 +207,9 @@ GEM
     mime-types (1.25.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.10.1)
-    multipart-post (2.0.0)
-    net-http-persistent (2.9.4)
+    multi_json (1.8.0)
+    multipart-post (1.2.0)
+    net-http-persistent (2.9)
     net-http-pipeline (1.0.1)
     pg (0.13.2)
     polyglot (0.3.5)
@@ -217,7 +218,10 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pusher (0.11.3)
+    puma (2.3.1)
+      rack (>= 1.1, < 2.0)
+    pusher (0.12.0)
+      httpclient (~> 2.3.0)
       multi_json (~> 1.0)
       signature (~> 0.1.6)
     rack (1.4.5)
diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index c490e4a0..018bafdd 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -185,6 +185,8 @@ module Travis::Api
         Travis::LogSubscriber::ActiveRecordMetrics.attach
         Travis::Notification.setup(instrumentation: false)
 
+        # Travis::Metrics.setup from sf-te, does this conflict with the setup below?
+
         if Travis.config.librato
           email, token, source = Travis.config.librato.email,
                                          Travis.config.librato.token,