From 0739312391890952b4a1b315da0df557bb84076b Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Mon, 27 Oct 2014 23:43:04 -0400
Subject: [PATCH 01/12] Update dependencies

---
 Gemfile      |  2 +-
 Gemfile.lock | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0e4250f8..a3e35857 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ ruby '2.1.2'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core'
+gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'sf-hiro-bugfix'
 gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'travis-config',   '~> 0.1.0'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
diff --git a/Gemfile.lock b/Gemfile.lock
index 464628f7..4f9b7de7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: git://github.com/getsentry/raven-ruby.git
-  revision: bd026531c390a7fbc71980871a7951bc0f2d737f
+  revision: 1e12d8d5c288e97fd2fd64d28c2ffb7cad439eb2
   specs:
     sentry-raven (0.10.1)
       faraday (>= 0.7.6)
@@ -36,7 +36,8 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 0f487381ecf7f06f759116b60a1e9e8544784286
+  revision: e333a0127c1e09ba37edd547c9243478aba0f788
+  branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
@@ -68,13 +69,13 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-support.git
-  revision: 352419335e9b78cf087dbd8523879498d6177db4
+  revision: 40365216662f639d36fc3a0463c4e189ee1563dd
   specs:
     travis-support (0.0.1)
 
 GIT
   remote: git://github.com/travis-ci/travis-yaml.git
-  revision: 121678eba7280b8269a73c56953cafd20e884bdc
+  revision: 2c6ac75077123095e2ee8e8db435342ba2d03c2d
   specs:
     travis-yaml (0.1.0)
 
@@ -136,7 +137,7 @@ GEM
     bunny (0.8.0)
     celluloid (0.12.0)
       timers (>= 1.0.0)
-    chunky_png (1.3.1)
+    chunky_png (1.3.3)
     coder (0.4.0)
     coderay (1.1.0)
     coercible (1.0.0)
@@ -171,7 +172,7 @@ GEM
       activesupport
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.5)
+    ffi (1.9.6)
     foreman (0.64.0)
       dotenv (~> 0.7.0)
       thor (>= 0.13.6)
@@ -227,7 +228,7 @@ GEM
       multi_json (~> 1.0)
       signature (~> 0.1.6)
     rack (1.4.5)
-    rack-attack (4.1.1)
+    rack-attack (4.2.0)
       rack
     rack-protection (1.5.3)
       rack
@@ -268,7 +269,7 @@ GEM
     rspec-mocks (2.99.2)
     s3 (0.3.21)
       proxies (~> 0.2.0)
-    sass (3.4.5)
+    sass (3.4.6)
     sidekiq (2.5.0)
       celluloid (~> 0.12.0)
       compass
@@ -316,7 +317,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.41)
+    tzinfo (0.3.42)
     unicorn (4.8.3)
       kgio (~> 2.6)
       rack
@@ -327,7 +328,7 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    yard (0.8.7.4)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby

From e7e237943b148659280bea9c23cb4e9d34462949 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 28 Oct 2014 00:13:29 -0400
Subject: [PATCH 02/12] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4f9b7de7..3255c6fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: e333a0127c1e09ba37edd547c9243478aba0f788
+  revision: da5902bf0cbf1d4031bb4a6c7e7c82ff35ecc414
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From c0418c3cfbef57ea8c027fab08cf22de84656656 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 28 Oct 2014 10:56:26 -0400
Subject: [PATCH 03/12] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3255c6fa..c9668d88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: da5902bf0cbf1d4031bb4a6c7e7c82ff35ecc414
+  revision: 791d0e8224f2ce322ff20f9098ebd74953bcd236
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From 0ebdee564dbf8323b7e3481cffd702546014904f Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 28 Oct 2014 12:06:53 -0400
Subject: [PATCH 04/12] Update travis-core

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c9668d88..59fe3b65 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: git://github.com/getsentry/raven-ruby.git
-  revision: 1e12d8d5c288e97fd2fd64d28c2ffb7cad439eb2
+  revision: 84392e5db701f0b5c66802aab9cc82ef9a5ad830
   specs:
     sentry-raven (0.10.1)
       faraday (>= 0.7.6)
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 791d0e8224f2ce322ff20f9098ebd74953bcd236
+  revision: 624dd8f5e476d05ae86dc422035691516cd3d750
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From 326956fe270329215fc8f28f9a488e830d6c0c12 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 28 Oct 2014 12:40:25 -0400
Subject: [PATCH 05/12] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 59fe3b65..b5297d3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 624dd8f5e476d05ae86dc422035691516cd3d750
+  revision: fc676ed0c3cf4c28979a6f47a25fd34cdd94906b
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From b8f9401023d05da511bbf1802f1176c7524fae1e Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 28 Oct 2014 12:48:26 -0400
Subject: [PATCH 06/12] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b5297d3b..9fc9d11c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: fc676ed0c3cf4c28979a6f47a25fd34cdd94906b
+  revision: 86268a941ccf27c13ecd55935b7fad358f294427
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From f3731e3929b6e1df8c5a68bdd93a13da05e39e5d Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 28 Oct 2014 13:32:52 -0400
Subject: [PATCH 07/12] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9fc9d11c..342e8a74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 86268a941ccf27c13ecd55935b7fad358f294427
+  revision: f29e6bb0271aea3662017db29d6706a419cc3605
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From 597f2aa53f3cb551ed24786cf0b44462f6027a66 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Wed, 29 Oct 2014 08:58:56 -0400
Subject: [PATCH 08/12] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 342e8a74..7d39be59 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: f29e6bb0271aea3662017db29d6706a419cc3605
+  revision: 69f5f21ce8d6c9c63408705c4f32cb8fc08cea57
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From 7e2334c69fc66977eddeea444289559e82525343 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Wed, 29 Oct 2014 11:40:32 -0400
Subject: [PATCH 09/12] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7d39be59..671d142e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 69f5f21ce8d6c9c63408705c4f32cb8fc08cea57
+  revision: 2bbd75226593cd1dbd6fd52abe5f22bf70cea819
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From 36b639eaf36f4d6d17ddd79c4a1ad8b7626422de Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Wed, 29 Oct 2014 16:19:37 -0400
Subject: [PATCH 10/12] Switch back to travis-core master branch

https://github.com/travis-ci/travis-core/pull/404 has been merged
---
 Gemfile      | 2 +-
 Gemfile.lock | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index a3e35857..0e4250f8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ ruby '2.1.2'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'sf-hiro-bugfix'
+gem 'travis-core',     github: 'travis-ci/travis-core'
 gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'travis-config',   '~> 0.1.0'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
diff --git a/Gemfile.lock b/Gemfile.lock
index 671d142e..aa56e783 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,8 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 2bbd75226593cd1dbd6fd52abe5f22bf70cea819
-  branch: sf-hiro-bugfix
+  revision: b4c4ae9beb6ba8d813491273dc75fa582ee719b0
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)

From 2daab878a94988cecb535b401dcefabd1b7af6ff Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Wed, 29 Oct 2014 19:30:33 -0400
Subject: [PATCH 11/12] Relax SQL query requirements in specs

This corresponds to some extra work done when build matrix
is expanded.

See https://github.com/travis-ci/travis-core/pull/404
---
 spec/unit/api/v2/http/build_spec.rb  | 2 +-
 spec/unit/api/v2/http/builds_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/unit/api/v2/http/build_spec.rb b/spec/unit/api/v2/http/build_spec.rb
index a7ed68d8..ca97654e 100644
--- a/spec/unit/api/v2/http/build_spec.rb
+++ b/spec/unit/api/v2/http/build_spec.rb
@@ -80,7 +80,7 @@ describe 'Travis::Api::V2::Http::Build using Travis::Services::Builds::FindOne'
   let(:data)    { Travis::Api::V2::Http::Build.new(build).data }
 
   it 'queries' do
-    lambda { data }.should issue_queries(6)
+    lambda { data }.should issue_queries(8)
   end
 end
 
diff --git a/spec/unit/api/v2/http/builds_spec.rb b/spec/unit/api/v2/http/builds_spec.rb
index 73c98378..da9a7c43 100644
--- a/spec/unit/api/v2/http/builds_spec.rb
+++ b/spec/unit/api/v2/http/builds_spec.rb
@@ -71,7 +71,7 @@ describe 'Travis::Api::V2::Http::Builds using Travis::Services::Builds::FindAll'
   end
 
   it 'queries' do
-    lambda { data }.should issue_queries(3)
+    lambda { data }.should issue_queries(9)
   end
 end
 

From c3a25959c93b857badcc3ad7eb1dbd966c9dbd2c Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Wed, 29 Oct 2014 19:34:50 -0400
Subject: [PATCH 12/12] Update GC-related env var

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fbca476d..56e79126 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ language: ruby
 env:
   global:
     - RUBY_GC_MALLOC_LIMIT=90000000
-    - RUBY_FREE_MIN=200000
+    - RUBY_GC_HEAP_FREE_SLOTS=200000
 rvm:
   - 2.1.2
 addons: