Serve up paperclip attachments in a cache friendly way

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 35082453254a9d990182d0c2816876d95c8d5590..d9cf772534435402d2b46661ff65726fe689315a 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,72 +2,76 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionmailer (3.2.1)
+      actionpack (= 3.2.1)
+      mail (~> 2.4.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)

       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)

-      i18n (~> 0.6)
-      rack (~> 1.3.5)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)

       rack-cache (~> 1.1)
       rack-cache (~> 1.1)

-      rack-mount (~> 0.8.2)

       rack-test (~> 0.6.1)
       rack-test (~> 0.6.1)

-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)

       builder (~> 3.0.0)
       builder (~> 3.0.0)

-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      arel (~> 3.0.0)

       tzinfo (~> 0.3.29)
       tzinfo (~> 0.3.29)

-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
+      i18n (~> 0.6)

       multi_json (~> 1.0)
       multi_json (~> 1.0)

-    addressable (2.2.6)
-    arel (2.2.1)
+    addressable (2.2.7)
+    arel (3.0.1)

     builder (3.0.0)
     builder (3.0.0)

-    coffee-rails (3.1.1)
+    cocaine (0.2.1)
+    coffee-rails (3.2.2)

       coffee-script (>= 2.2.0)
       coffee-script (>= 2.2.0)

-      railties (~> 3.1.0)
+      railties (~> 3.2.0)

     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)

-    composite_primary_keys (4.1.2)
-      activerecord (~> 3.1)
+    composite_primary_keys (5.0.1)
+      activerecord (~> 3.2.0)
+    deadlock_retry (1.2.0)

     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)

-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)

     hike (1.2.1)
     hike (1.2.1)

+    http_accept_language (1.0.2)

     httpclient (2.2.4)
     i18n (0.6.0)
     httpclient (2.2.4)
     i18n (0.6.0)

-    jquery-rails (1.0.19)
-      railties (~> 3.0)
+    iconv (0.1)
+    journey (1.0.2)
+    jquery-rails (2.0.0)
+      railties (>= 3.2.0.beta, < 5.0)

       thor (~> 0.14)
     json (1.6.5)
     libv8 (3.3.10.4)
     libxml-ruby (2.2.2)
       thor (~> 0.14)
     json (1.6.5)
     libv8 (3.3.10.4)
     libxml-ruby (2.2.2)

-    mail (2.3.0)
+    mail (2.4.1)

       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcache-client (1.8.5)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcache-client (1.8.5)

-    memcached (1.3.6)
+    memcached (1.3.7)

     mime-types (1.17.2)
     mime-types (1.17.2)

-    multi_json (1.0.4)
-    multipart-post (1.1.4)
+    multi_json (1.1.0)
+    multipart-post (1.1.5)

     nokogiri (1.5.0)
     oauth (0.4.5)
     oauth-plugin (0.4.0.rc2)
     nokogiri (1.5.0)
     oauth (0.4.5)
     oauth-plugin (0.4.0.rc2)


@@ -80,13 +84,16 @@ GEM
       multi_json (~> 1.0)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
       multi_json (~> 1.0)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)

-    pg (0.12.2)
+    paperclip (2.6.0)
+      activerecord (>= 2.3.0)
+      activesupport (>= 2.3.2)
+      cocaine (>= 0.0.2)
+      mime-types
+    pg (0.13.1)

     polyglot (0.3.3)
     polyglot (0.3.3)

-    rack (1.3.6)
+    rack (1.4.1)

     rack-cache (1.1)
       rack (>= 0.4)
     rack-cache (1.1)
       rack (>= 0.4)

-    rack-mount (0.8.3)
-      rack (>= 1.0.0)

     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)


@@ -94,21 +101,21 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)

-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    rails (3.2.1)
+      actionmailer (= 3.2.1)
+      actionpack (= 3.2.1)
+      activerecord (= 3.2.1)
+      activeresource (= 3.2.1)
+      activesupport (= 3.2.1)

       bundler (~> 1.0)
       bundler (~> 1.0)

-      railties (= 3.1.3)
+      railties (= 3.2.1)

     rails-i18n-updater (1.0.1)
       actionpack
       activesupport
       rails
     rails-i18n-updater (1.0.1)
       actionpack
       activesupport
       rails

-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)

       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)


@@ -116,22 +123,20 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)

-    rinku (1.5.0)
-    rmagick (2.13.1)
+    rinku (1.5.1)

     ruby-openid (2.1.8)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
     ruby-openid (2.1.8)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)

-    sass (3.1.12)
-    sass-rails (3.1.5)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (~> 3.1.10)
-      tilt (~> 1.3.2)
-    sprockets (2.0.3)
+    sass (3.1.15)
+    sass-rails (3.2.4)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    sprockets (2.1.2)

       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)

-    therubyracer (0.9.9)
+    therubyracer (0.9.10)

       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)


@@ -140,7 +145,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)

-    uglifier (1.2.2)
+    uglifier (1.2.3)

       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     validates_email_format_of (1.5.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     validates_email_format_of (1.5.3)


@@ -150,24 +155,27 @@ PLATFORMS
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)

-  coffee-rails (~> 3.1.0)
-  composite_primary_keys (>= 4.1.2)
+  coffee-rails (~> 3.2.1)
+  composite_primary_keys (>= 5.0.0)
+  deadlock_retry (>= 1.2.0)

   dynamic_form
   dynamic_form

+  http_accept_language (>= 1.0.2)

   httpclient
   httpclient

+  iconv

   jquery-rails
   libxml-ruby (>= 2.0.5)
   memcache-client
   memcached
   oauth-plugin (>= 0.4.0.pre7)
   open_id_authentication (>= 1.1.0)
   jquery-rails
   libxml-ruby (>= 2.0.5)
   memcache-client
   memcached
   oauth-plugin (>= 0.4.0.pre7)
   open_id_authentication (>= 1.1.0)

+  paperclip (~> 2.0)

   pg
   pg

-  rails (= 3.1.3)
+  rails (= 3.2.1)

   rails-i18n-updater
   rinku (>= 1.2.2)
   rails-i18n-updater
   rinku (>= 1.2.2)

-  rmagick

   sanitize
   sanitize

-  sass-rails (~> 3.1.0)
+  sass-rails (~> 3.2.3)

   therubyracer
   timecop
   therubyracer
   timecop

-  uglifier
+  uglifier (>= 1.0.3)

   validates_email_format_of (>= 1.5.1)
   validates_email_format_of (>= 1.5.1)