suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/travis-ci/travis-api

Browse Source 
update travis-core, and lock down bunny for now

Conflicts:
	Gemfile.lock
This commit is contained in:
Josh Kalderimis 2013-07-13 16:21:34 +02:00
commit 5a6e4b4a98
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -16,7 +16,7 @@ gem 'rack-contrib', github: 'rack/rack-contrib'
gem 'rack-cache', '~> 1.2' gem 'rack-cache', '~> 1.2'
gem 'rack-attack' gem 'rack-attack'
gem 'gh' gem 'gh'
gem 'bunny' gem 'bunny', '~> 0.8.0'
gem 'dalli' gem 'dalli'
gem 'pry' gem 'pry'
gem 'metriks', '0.9.9.5' gem 'metriks', '0.9.9.5'

9
Gemfile.lock
View File

@ -1,11 +1,10 @@
GIT GIT
remote: git://github.com/getsentry/raven-ruby.git remote: git://github.com/getsentry/raven-ruby.git
revision: 299f326b420f9d80cfeea9d4e7bfd66ac93f5ad2 revision: eb1a0072af1132594c574cc6a64618cf900e4810
specs: specs:
sentry-raven (0.5.0) sentry-raven (0.5.0)
faraday (>= 0.7.6) faraday (>= 0.7.6)
hashie (>= 1.1.0) hashie (>= 1.1.0)
multi_json (~> 1.0)
uuidtools uuidtools
GIT GIT
@ -32,7 +31,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-core.git remote: git://github.com/travis-ci/travis-core.git
revision: 70f0cd27822662d713edef2855a9a3aaa217f311 revision: f8f12caaed106f7447ec723e21d837253025e971
specs: specs:
travis-core (0.0.1) travis-core (0.0.1)
actionmailer (~> 3.2.12) actionmailer (~> 3.2.12)
@ -137,7 +136,7 @@ GEM
dotenv (0.8.0) dotenv (0.8.0)
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.3) eventmachine (1.0.3)
facter (1.7.1) facter (1.7.2)
factory_girl (2.4.2) factory_girl (2.4.2)
activesupport activesupport
faraday (0.8.7) faraday (0.8.7)
@ -279,7 +278,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
ar-octopus! ar-octopus!
bunny bunny (~> 0.8.0)
dalli dalli
database_cleaner (~> 0.8.0) database_cleaner (~> 0.8.0)
factory_girl (~> 2.4.0) factory_girl (~> 2.4.0)