Bump travis-core and use master branch

2014-04-15 10:53:59 +02:00 · 2014-04-15 10:53:59 +02:00 · 3994b82f78
commit 3994b82f78
parent f107d4676e
2 changed files with 2 additions and 3 deletions
--- a/2
+++ b/2
@ -3,7 +3,7 @@ ruby '2.0.0'
 source 'https://rubygems.org'
 gemspec

-gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'ps-settings-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'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -23,8 +23,7 @@ GIT

 GIT
  remote: git://github.com/travis-ci/travis-core.git
-  revision: e9e0b02da4c63a2cc0846275df1a819944e9311a
-  branch: ps-settings-encryption
+  revision: d2a19ee99f543eb2db376390847b682caa960b7f
  specs:
    travis-core (0.0.1)
      actionmailer (~> 3.2.12)