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

This commit is contained in:
Konstantin Haase 2013-10-15 12:28:46 +02:00
commit 9c253c9c16
2 changed files with 4 additions and 6 deletions

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', '~> 0.10.8' 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'

View File

@ -52,7 +52,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-support.git remote: git://github.com/travis-ci/travis-support.git
revision: fffb09b3e6967cdb6c33f04ac7f7840a8df77400 revision: df798c71815d09c3422f29fd90ad4a73deec0f44
specs: specs:
travis-support (0.0.1) travis-support (0.0.1)
@ -107,14 +107,12 @@ GEM
i18n (~> 0.6, >= 0.6.4) i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.3.5) addressable (2.3.5)
amq-protocol (1.8.0)
arel (3.0.2) arel (3.0.2)
atomic (1.1.14) atomic (1.1.14)
avl_tree (1.1.3) avl_tree (1.1.3)
backports (2.8.2) backports (2.8.2)
builder (3.0.4) builder (3.0.4)
bunny (0.10.8) bunny (0.8.0)
amq-protocol (>= 1.6.0)
celluloid (0.12.4) celluloid (0.12.4)
facter (>= 1.6.12) facter (>= 1.6.12)
timers (>= 1.0.0) timers (>= 1.0.0)
@ -277,7 +275,7 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
bunny (~> 0.10.8) 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)