From 2baa5c9ec3f3b6e0fc7cf72acbb653af0a56eee9 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 4 Feb 2013 13:49:12 +0100
Subject: [PATCH] Use travis-core from master

---
 Gemfile      | 2 +-
 Gemfile.lock | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index c393b1d0..b0810ca4 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: 'ps-db-encryption'
+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 c4aba7c9..c01bedae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,8 +45,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 2302df3b30b533d675dca8212648768058f69cd3
-  branch: ps-db-encryption
+  revision: 299ceefc5dff40a41271d1508a9931857354458f
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.11)
@@ -134,7 +133,7 @@ GEM
     arel (3.0.2)
     atomic (1.0.1)
     avl_tree (1.1.3)
-    backports (2.7.1)
+    backports (2.8.2)
     builder (3.0.4)
     bunny (0.8.0)
     celluloid (0.12.4)
@@ -179,7 +178,7 @@ GEM
       atomic (~> 1.0)
       avl_tree (~> 1.1.2)
       hitimes (~> 1.1)
-    mime-types (1.19)
+    mime-types (1.20.1)
     mocha (0.13.2)
       metaclass (~> 0.0.1)
     multi_json (1.5.0)
@@ -202,7 +201,7 @@ GEM
       slop (~> 3.4)
     puma (1.6.3)
       rack (~> 1.2)
-    pusher (0.11.2)
+    pusher (0.11.3)
       multi_json (~> 1.0)
       signature (~> 0.1.6)
     rack (1.4.4)