From ac400906a1f40dfca3817fc79d7be0c78df2788d Mon Sep 17 00:00:00 2001 From: carlad Date: Mon, 14 Mar 2016 14:59:33 +0100 Subject: [PATCH 1/2] bump travis-core for db statement_timeout config --- Gemfile | 2 +- Gemfile.lock | 37 +++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index bf2e564b..542a1c6e 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '2.1.7' if ENV.key?('DYNO') gem 's3', github: 'travis-ci/s3' -gem 'travis-core', github: 'travis-ci/travis-core' +gem 'travis-core', github: 'travis-ci/travis-core', branch: 'cd-statement-timeout' gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-config', '~> 0.1.0' gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil diff --git a/Gemfile.lock b/Gemfile.lock index ec8ac24c..e34dd3de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,9 +36,9 @@ GIT GIT remote: git://github.com/rtomayko/rack-cache.git - revision: f96febebed7700337e8c362403b081e45b8e4f13 + revision: 2d6618172c39c53dceab2e2946d87496154f3e52 specs: - rack-cache (1.5.1) + rack-cache (1.6.1) rack (>= 0.4) GIT @@ -50,7 +50,8 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: fb39f8af5628444e2d7f5893a9f09fde7b0796e2 + revision: ce489dfaf9457bd43844894c1240defea087f831 + branch: cd-statement-timeout specs: travis-core (0.0.1) actionmailer (~> 3.2.19) @@ -117,12 +118,12 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.22) - actionpack (= 3.2.22) + actionmailer (3.2.22.2) + actionpack (= 3.2.22.2) mail (~> 2.5.4) - actionpack (3.2.22) - activemodel (= 3.2.22) - activesupport (= 3.2.22) + actionpack (3.2.22.2) + activemodel (= 3.2.22.2) + activesupport (= 3.2.22.2) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -132,15 +133,15 @@ GEM sprockets (~> 2.2.1) active_model_serializers (0.9.0) activemodel (>= 3.2) - activemodel (3.2.22) - activesupport (= 3.2.22) + activemodel (3.2.22.2) + activesupport (= 3.2.22.2) builder (~> 3.0.0) - activerecord (3.2.22) - activemodel (= 3.2.22) - activesupport (= 3.2.22) + activerecord (3.2.22.2) + activemodel (= 3.2.22.2) + activesupport (= 3.2.22.2) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activesupport (3.2.22) + activesupport (3.2.22.2) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.4.0) @@ -151,7 +152,7 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - backports (3.6.7) + backports (3.6.8) builder (3.0.4) bunny (0.8.0) celluloid (0.16.0) @@ -252,9 +253,9 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - railties (3.2.22) - actionpack (= 3.2.22) - activesupport (= 3.2.22) + railties (3.2.22.2) + actionpack (= 3.2.22.2) + activesupport (= 3.2.22.2) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) From e1fefaf456fd1557a39e826b5141ef49f480a861 Mon Sep 17 00:00:00 2001 From: carlad Date: Mon, 14 Mar 2016 16:29:41 +0100 Subject: [PATCH 2/2] bump travis-core statement_timeout --- Gemfile | 2 +- Gemfile.lock | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 542a1c6e..bf2e564b 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '2.1.7' if ENV.key?('DYNO') gem 's3', github: 'travis-ci/s3' -gem 'travis-core', github: 'travis-ci/travis-core', branch: 'cd-statement-timeout' +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 diff --git a/Gemfile.lock b/Gemfile.lock index e34dd3de..6701537d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,8 +50,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: ce489dfaf9457bd43844894c1240defea087f831 - branch: cd-statement-timeout + revision: 5bff6bf138d31754e38b8c148e56ba8ceab39859 specs: travis-core (0.0.1) actionmailer (~> 3.2.19)