Merge branch 'master' into cd-v3

This commit is contained in:
carlad 2016-03-15 12:12:36 +01:00
commit 4462613c46

View File

@ -36,9 +36,9 @@ GIT
GIT
remote: git://github.com/rtomayko/rack-cache.git
revision: f96febebed7700337e8c362403b081e45b8e4f13
revision: 2d6618172c39c53dceab2e2946d87496154f3e52
specs:
rack-cache (1.5.1)
rack-cache (1.6.1)
rack (>= 0.4)
GIT
@ -50,7 +50,7 @@ GIT
GIT
remote: git://github.com/travis-ci/travis-core.git
revision: fb39f8af5628444e2d7f5893a9f09fde7b0796e2
revision: 5bff6bf138d31754e38b8c148e56ba8ceab39859
specs:
travis-core (0.0.1)
actionmailer (~> 3.2.19)
@ -117,12 +117,12 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.22)
actionpack (= 3.2.22)
actionmailer (3.2.22.2)
actionpack (= 3.2.22.2)
mail (~> 2.5.4)
actionpack (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
actionpack (3.2.22.2)
activemodel (= 3.2.22.2)
activesupport (= 3.2.22.2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@ -132,15 +132,15 @@ GEM
sprockets (~> 2.2.1)
active_model_serializers (0.9.0)
activemodel (>= 3.2)
activemodel (3.2.22)
activesupport (= 3.2.22)
activemodel (3.2.22.2)
activesupport (= 3.2.22.2)
builder (~> 3.0.0)
activerecord (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
activerecord (3.2.22.2)
activemodel (= 3.2.22.2)
activesupport (= 3.2.22.2)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activesupport (3.2.22)
activesupport (3.2.22.2)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.4.0)
@ -151,7 +151,7 @@ GEM
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
backports (3.6.7)
backports (3.6.8)
builder (3.0.4)
bunny (0.8.0)
celluloid (0.16.0)
@ -252,9 +252,9 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
railties (3.2.22)
actionpack (= 3.2.22)
activesupport (= 3.2.22)
railties (3.2.22.2)
actionpack (= 3.2.22.2)
activesupport (= 3.2.22.2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)