Fix bad database query for RSS feeds of trace file tags

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 1bbc63f46993b667416eac889a078308b6ad9c92..98a25e9ab110d19f2c84b74fa10fe625fede3ac9 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,9 +40,9 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    composite_primary_keys (5.0.0)
+    composite_primary_keys (5.0.1)
       activerecord (~> 3.2.0)
-    deadlock_retry (1.1.2)
+    deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (1.3.0)
@@ -123,7 +123,7 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rinku (1.5.0)
+    rinku (1.5.1)
     rmagick (2.13.1)
     ruby-openid (2.1.8)
     sanitize (2.0.3)
@@ -158,7 +158,7 @@ DEPENDENCIES
   SystemTimer (>= 1.1.3)
   coffee-rails (~> 3.2.1)
   composite_primary_keys (>= 5.0.0)
-  deadlock_retry (>= 1.1.2)
+  deadlock_retry (>= 1.2.0)
   dynamic_form
   http_accept_language (>= 1.0.2)
   httpclient