Load Potlatch 2 through the asset pipeline

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 0dcb5ccff15a75642e0bd41def60322531ae5a60..d7b29c14c592d2c05c4d803f2f13dc2353625f4a 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)


@@ -108,7 +109,7 @@ GEM
       activesupport (= 3.2.2)
       bundler (~> 1.0)
       railties (= 3.2.2)
       activesupport (= 3.2.2)
       bundler (~> 1.0)
       railties (= 3.2.2)

-    rails-i18n (0.5.1)
+    rails-i18n (0.5.2)

       i18n (~> 0.5)
     railties (3.2.2)
       actionpack (= 3.2.2)
       i18n (~> 0.5)
     railties (3.2.2)
       actionpack (= 3.2.2)


@@ -120,7 +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.0)
+    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)


@@ -142,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)


@@ -157,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


@@ -168,7 +170,7 @@ DEPENDENCIES
   paperclip (~> 2.0)
   pg
   rails (= 3.2.2)
   paperclip (~> 2.0)
   pg
   rails (= 3.2.2)

-  rails-i18n (>= 0.5.1)
+  rails-i18n (>= 0.5.2)

   redcarpet
   rinku (>= 1.2.2)
   sanitize
   redcarpet
   rinku (>= 1.2.2)
   sanitize