From 616b8df27cd9b82b313909def4008d960bb4f827 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Sun, 27 Jan 2013 21:42:00 +0100 Subject: [PATCH] Use travis-core from master --- Gemfile | 2 +- Gemfile.lock | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 83b45662..d75971de 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ ruby '1.9.3' rescue nil source :rubygems gemspec -gem 'travis-core', github: 'travis-ci/travis-core', branch: 'sf-archive-logs' +gem 'travis-core', github: 'travis-ci/travis-core' gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741' gem 'sinatra' #github: 'sinatra/sinatra' diff --git a/Gemfile.lock b/Gemfile.lock index d447a621..daf0b41c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,8 +45,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 801d0dee5bd85811afa000f705f34e29ff2c65e9 - branch: sf-archive-logs + revision: 987188a5f96f5d7e4f6a6e314ab402f3fbad0963 specs: travis-core (0.0.1) actionmailer (~> 3.2.11) @@ -60,7 +59,7 @@ GIT postmark-rails (~> 0.4.1) pusher (~> 0.11.0) railties (~> 3.2.11) - rake (~> 0.9.2.2) + rake redis (~> 3.0) rollout (~> 1.1.0) simple_states (~> 0.1.1) @@ -221,7 +220,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) + rake (0.9.6) rdoc (3.12) json (~> 1.4) redcarpet (2.2.2)