Load Potlatch 2 through the asset pipeline

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 56efbdc7ee8ae690a86610dd92abe9565fefecd1..d7b29c14c592d2c05c4d803f2f13dc2353625f4a 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)

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

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

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

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


@@ -15,18 +15,18 @@ GEM
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)

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

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

-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      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.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)

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


@@ -40,7 +40,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)

-    composite_primary_keys (5.0.1)
+    composite_primary_keys (5.0.2)

       activerecord (~> 3.2.0)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
       activerecord (~> 3.2.0)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)


@@ -52,6 +52,7 @@ GEM
       multipart-post (~> 1.1)
       rack (~> 1.1)
     hike (1.2.1)
       multipart-post (~> 1.1)
       rack (~> 1.1)
     hike (1.2.1)

+    htmlentities (4.3.1)

     http_accept_language (1.0.2)
     httpclient (2.2.4)
     i18n (0.6.0)
     http_accept_language (1.0.2)
     httpclient (2.2.4)
     i18n (0.6.0)


@@ -63,7 +64,7 @@ GEM
     json (1.6.5)
     libv8 (3.3.10.4)
     libxml-ruby (2.2.2)
     json (1.6.5)
     libv8 (3.3.10.4)
     libxml-ruby (2.2.2)

-    mail (2.4.1)
+    mail (2.4.4)

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


@@ -71,7 +72,7 @@ GEM
     mime-types (1.17.2)
     multi_json (1.1.0)
     multipart-post (1.1.5)
     mime-types (1.17.2)
     multi_json (1.1.0)
     multipart-post (1.1.5)

-    nokogiri (1.5.0)
+    nokogiri (1.5.2)

     oauth (0.4.5)
     oauth-plugin (0.4.0.rc2)
       multi_json
     oauth (0.4.5)
     oauth-plugin (0.4.0.rc2)
       multi_json


@@ -91,7 +92,7 @@ GEM
     pg (0.13.2)
     polyglot (0.3.3)
     rack (1.4.1)
     pg (0.13.2)
     polyglot (0.3.3)
     rack (1.4.1)

-    rack-cache (1.1)
+    rack-cache (1.2)

       rack (>= 0.4)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       rack (>= 0.4)
     rack-openid (1.3.1)
       rack (>= 1.1.0)


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

-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
+    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.1)
-    rails-i18n (0.5.1)
+      railties (= 3.2.2)
+    rails-i18n (0.5.2)

       i18n (~> 0.5)
       i18n (~> 0.5)

-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+    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)


@@ -120,6 +121,7 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)

+    redcarpet (2.1.1)

     rinku (1.5.1)
     ruby-openid (2.1.8)
     sanitize (2.0.3)
     rinku (1.5.1)
     ruby-openid (2.1.8)
     sanitize (2.0.3)


@@ -141,7 +143,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)

-    tzinfo (0.3.31)
+    tzinfo (0.3.32)

     uglifier (1.2.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     uglifier (1.2.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)


@@ -156,6 +158,7 @@ DEPENDENCIES
   composite_primary_keys (>= 5.0.0)
   deadlock_retry (>= 1.2.0)
   dynamic_form
   composite_primary_keys (>= 5.0.0)
   deadlock_retry (>= 1.2.0)
   dynamic_form

+  htmlentities

   http_accept_language (>= 1.0.2)
   httpclient
   iconv
   http_accept_language (>= 1.0.2)
   httpclient
   iconv


@@ -166,8 +169,9 @@ DEPENDENCIES
   open_id_authentication (>= 1.1.0)
   paperclip (~> 2.0)
   pg
   open_id_authentication (>= 1.1.0)
   paperclip (~> 2.0)
   pg

-  rails (= 3.2.1)
-  rails-i18n (>= 0.5.1)
+  rails (= 3.2.2)
+  rails-i18n (>= 0.5.2)
+  redcarpet

   rinku (>= 1.2.2)
   sanitize
   sass-rails (~> 3.2.3)
   rinku (>= 1.2.2)
   sanitize
   sass-rails (~> 3.2.3)