Fix some issues with the new tab styling

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 75248b9271d446d4a73f44adcbdeb6c443cb6126..4709cd1957672fdf359c91764acaeadc7f8b2456 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,36 +2,37 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    actionmailer (3.2.0)
-      actionpack (= 3.2.0)
+    actionmailer (3.2.2)
+      actionpack (= 3.2.2)

       mail (~> 2.4.0)
       mail (~> 2.4.0)

-    actionpack (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)

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

-      journey (~> 1.0.0)
+      journey (~> 1.0.1)

       rack (~> 1.4.0)
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
       rack (~> 1.4.0)
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)

-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)

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

-    activerecord (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-      arel (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)

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

-    activeresource (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-    activesupport (3.2.0)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)

       i18n (~> 0.6)
       multi_json (~> 1.0)
       i18n (~> 0.6)
       multi_json (~> 1.0)

-    addressable (2.2.6)
-    arel (3.0.0)
+    addressable (2.2.7)
+    arel (3.0.2)

     builder (3.0.0)
     builder (3.0.0)

+    cocaine (0.2.1)

     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)


@@ -39,8 +40,9 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.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)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (1.3.0)


@@ -54,9 +56,9 @@ GEM
     httpclient (2.2.4)
     i18n (0.6.0)
     iconv (0.1)
     httpclient (2.2.4)
     i18n (0.6.0)
     iconv (0.1)

-    journey (1.0.1)
-    jquery-rails (2.0.0)
-      railties (>= 3.2.0.beta, < 5.0)
+    journey (1.0.3)
+    jquery-rails (2.0.1)
+      railties (>= 3.2.0, < 5.0)

       thor (~> 0.14)
     json (1.6.5)
     libv8 (3.3.10.4)
       thor (~> 0.14)
     json (1.6.5)
     libv8 (3.3.10.4)


@@ -65,11 +67,10 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)

-    memcache-client (1.8.5)
-    memcached (1.3.6)
+    memcached (1.4.1)

     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)


@@ -82,7 +83,12 @@ 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.7.0)
+      activerecord (>= 2.3.0)
+      activesupport (>= 2.3.2)
+      cocaine (>= 0.0.2)
+      mime-types
+    pg (0.13.2)

     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.1)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.1)


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

-    rails (3.2.0)
-      actionmailer (= 3.2.0)
-      actionpack (= 3.2.0)
-      activerecord (= 3.2.0)
-      activeresource (= 3.2.0)
-      activesupport (= 3.2.0)
+    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)
       bundler (~> 1.0)

-      railties (= 3.2.0)
-    rails-i18n-updater (1.0.1)
-      actionpack
-      activesupport
-      rails
-    railties (3.2.0)
-      actionpack (= 3.2.0)
-      activesupport (= 3.2.0)
+      railties (= 3.2.2)
+    rails-i18n (0.5.1)
+      i18n (~> 0.5)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)

       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,12 +120,11 @@ 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 (3.1.15)

     sass-rails (3.2.4)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
     sass-rails (3.2.4)
       railties (~> 3.2.0)
       sass (>= 3.1.10)


@@ -130,7 +133,7 @@ GEM
       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)


@@ -150,22 +153,22 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   coffee-rails (~> 3.2.1)
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   coffee-rails (~> 3.2.1)

-  composite_primary_keys (>= 4.1.2)
+  composite_primary_keys (>= 5.0.0)
+  deadlock_retry (>= 1.2.0)

   dynamic_form
   http_accept_language (>= 1.0.2)
   httpclient
   iconv
   jquery-rails
   libxml-ruby (>= 2.0.5)
   dynamic_form
   http_accept_language (>= 1.0.2)
   httpclient
   iconv
   jquery-rails
   libxml-ruby (>= 2.0.5)

-  memcache-client
-  memcached
+  memcached (>= 1.4.1)

   oauth-plugin (>= 0.4.0.pre7)
   open_id_authentication (>= 1.1.0)
   oauth-plugin (>= 0.4.0.pre7)
   open_id_authentication (>= 1.1.0)

+  paperclip (~> 2.0)

   pg
   pg

-  rails (= 3.2.0)
-  rails-i18n-updater
+  rails (= 3.2.2)
+  rails-i18n (>= 0.5.1)

   rinku (>= 1.2.2)
   rinku (>= 1.2.2)

-  rmagick

   sanitize
   sass-rails (~> 3.2.3)
   therubyracer
   sanitize
   sass-rails (~> 3.2.3)
   therubyracer