X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/da109c9e6b4d29aa33837167c23ffee3be17eed2..abb13e4a91db1fa2933f9971130b7a21dfc06634:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index f6e1bf4ca..10a28c821 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,31 +2,31 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.2.6) - actionpack (= 3.2.6) + actionmailer (3.2.7) + actionpack (= 3.2.7) mail (~> 2.4.4) - actionpack (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + actionpack (3.2.7) + activemodel (= 3.2.7) + activesupport (= 3.2.7) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) + journey (~> 1.0.4) rack (~> 1.4.0) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.1.3) - activemodel (3.2.6) - activesupport (= 3.2.6) + activemodel (3.2.7) + activesupport (= 3.2.7) builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + activerecord (3.2.7) + activemodel (= 3.2.7) + activesupport (= 3.2.7) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - activesupport (3.2.6) + activeresource (3.2.7) + activemodel (= 3.2.7) + activesupport (= 3.2.7) + activesupport (3.2.7) i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) @@ -61,9 +61,9 @@ GEM jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) - json (1.7.3) - jwt (0.1.4) - json (>= 1.2.4) + json (1.7.4) + jwt (0.1.5) + multi_json (>= 1.0) libv8 (3.3.10.4) libxml-ruby (2.3.3) mail (2.4.4) @@ -72,7 +72,7 @@ GEM treetop (~> 1.4.8) memcached (1.4.3) mime-types (1.19) - minitest (3.2.0) + minitest (3.3.0) multi_json (1.3.6) multipart-post (1.1.5) nokogiri (1.5.5) @@ -107,19 +107,19 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.6) - actionmailer (= 3.2.6) - actionpack (= 3.2.6) - activerecord (= 3.2.6) - activeresource (= 3.2.6) - activesupport (= 3.2.6) + rails (3.2.7) + actionmailer (= 3.2.7) + actionpack (= 3.2.7) + activerecord (= 3.2.7) + activeresource (= 3.2.7) + activesupport (= 3.2.7) bundler (~> 1.0) - railties (= 3.2.6) + railties (= 3.2.7) rails-i18n (0.6.5) i18n (~> 0.5) - railties (3.2.6) - actionpack (= 3.2.6) - activesupport (= 3.2.6) + railties (3.2.7) + actionpack (= 3.2.7) + activesupport (= 3.2.7) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -145,7 +145,7 @@ GEM libv8 (~> 3.3.10) thor (0.15.4) tilt (1.3.3) - timecop (0.3.5) + timecop (0.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1) @@ -178,7 +178,7 @@ DEPENDENCIES open_id_authentication (>= 1.1.0) paperclip (~> 2.0) pg - rails (= 3.2.6) + rails (= 3.2.7) rails-i18n (>= 0.6.3) redcarpet rinku (>= 1.2.2)