X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ec0c1dfd4719ed9508d06880b196cbe2c5c2050c..c5a54b779cf771fd6d0cbc592f49ac3c51b9b390:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 6028ebf4c..4709cd195 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,12 +2,12 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.2.1) - actionpack (= 3.2.1) + actionmailer (3.2.2) + actionpack (= 3.2.2) mail (~> 2.4.0) - actionpack (3.2.1) - activemodel (= 3.2.1) - activesupport (= 3.2.1) + actionpack (3.2.2) + activemodel (= 3.2.2) + activesupport (= 3.2.2) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.1) @@ -15,18 +15,18 @@ GEM rack-cache (~> 1.1) rack-test (~> 0.6.1) sprockets (~> 2.1.2) - activemodel (3.2.1) - activesupport (= 3.2.1) + activemodel (3.2.2) + activesupport (= 3.2.2) builder (~> 3.0.0) - activerecord (3.2.1) - activemodel (= 3.2.1) - activesupport (= 3.2.1) - arel (~> 3.0.0) + activerecord (3.2.2) + activemodel (= 3.2.2) + activesupport (= 3.2.2) + arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.1) - activemodel (= 3.2.1) - activesupport (= 3.2.1) - activesupport (3.2.1) + activeresource (3.2.2) + activemodel (= 3.2.2) + activesupport (= 3.2.2) + activesupport (3.2.2) i18n (~> 0.6) multi_json (~> 1.0) addressable (2.2.7) @@ -100,19 +100,19 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.1) - actionmailer (= 3.2.1) - actionpack (= 3.2.1) - activerecord (= 3.2.1) - activeresource (= 3.2.1) - activesupport (= 3.2.1) + rails (3.2.2) + actionmailer (= 3.2.2) + actionpack (= 3.2.2) + activerecord (= 3.2.2) + activeresource (= 3.2.2) + activesupport (= 3.2.2) bundler (~> 1.0) - railties (= 3.2.1) - rails-i18n (0.4.0) + railties (= 3.2.2) + rails-i18n (0.5.1) i18n (~> 0.5) - railties (3.2.1) - actionpack (= 3.2.1) - activesupport (= 3.2.1) + railties (3.2.2) + actionpack (= 3.2.2) + activesupport (= 3.2.2) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -166,8 +166,8 @@ DEPENDENCIES open_id_authentication (>= 1.1.0) paperclip (~> 2.0) pg - rails (= 3.2.1) - rails-i18n + rails (= 3.2.2) + rails-i18n (>= 0.5.1) rinku (>= 1.2.2) sanitize sass-rails (~> 3.2.3)