X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d68368e0d571ae6b953e0f3900e3f4c304076769..799b6d4cc72cc339679f5f458d98504c36b49aa1:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 7292a7141..5d4372f2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,8 +40,8 @@ GEM coffee-script-source execjs coffee-script-source (1.4.0) - composite_primary_keys (5.0.9) - activerecord (~> 3.2.0, >= 3.2.8) + composite_primary_keys (5.0.10) + activerecord (~> 3.2.0, >= 3.2.9) deadlock_retry (1.2.0) dynamic_form (1.1.4) ejs (1.1.1) @@ -74,7 +74,7 @@ GEM treetop (~> 1.4.8) memcached (1.4.6) mime-types (1.19) - minitest (4.2.0) + minitest (4.3.0) multi_json (1.3.7) multipart-post (1.1.5) nokogiri (1.5.5) @@ -129,7 +129,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.0) + rake (10.0.2) rdoc (3.12) json (~> 1.4) redcarpet (2.2.2) @@ -168,7 +168,7 @@ DEPENDENCIES SystemTimer (>= 1.1.3) bigdecimal coffee-rails (~> 3.2.1) - composite_primary_keys (>= 5.0.9) + composite_primary_keys (>= 5.0.10) deadlock_retry (>= 1.2.0) dynamic_form ejs