From 5b0af649597cd7e76e6c8bdda8c5d1ac75094c5c Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 1 Apr 2014 15:34:21 +0200
Subject: [PATCH] Use travis-core from ps-settings-encryption branch

---
 Gemfile      |  4 ++--
 Gemfile.lock | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 69604289..637f9792 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,11 +3,12 @@ ruby '2.0.0'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core'
+gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'ps-settings-encryption'
 gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
 gem 'sinatra'
 gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require: nil
+gem 'debugger'
 
 gem 'active_model_serializers'
 gem 'unicorn'
@@ -32,7 +33,6 @@ end
 group :development do
   gem 'foreman'
   gem 'rerun'
-  # gem 'debugger'
   gem 'rb-fsevent', '~> 0.9.1'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ea2e6e73..cdda0d5b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,12 +23,14 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: dd94b9d19ac4cc33f383f740194ba1b3c6a73d3a
+  revision: bb1b9584dfd970fb6ab1d6b6b3efbbacc51e1970
+  branch: ps-settings-encryption
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.12)
       activerecord (~> 3.2.12)
       coder (~> 0.4.0)
+      coercible (~> 1.0.0)
       data_migrations (~> 0.0.1)
       gh
       hashr (~> 0.0.19)
@@ -121,6 +123,9 @@ GEM
       timers (>= 1.0.0)
     coder (0.4.0)
     coderay (1.1.0)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    columnize (0.3.6)
     connection_pool (0.9.3)
     daemons (1.1.9)
     dalli (2.6.4)
@@ -128,6 +133,14 @@ GEM
       activerecord
       rake
     database_cleaner (0.8.0)
+    debugger (1.6.2)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     dotenv (0.9.0)
     erubis (2.7.0)
@@ -264,6 +277,8 @@ GEM
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
     thor (0.14.6)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
     timers (1.1.0)
     treetop (1.4.15)
@@ -285,6 +300,7 @@ DEPENDENCIES
   bunny (~> 0.8.0)
   dalli
   database_cleaner (~> 0.8.0)
+  debugger
   factory_girl (~> 2.4.0)
   foreman
   gh