Update Potlatch 2 to 2.3-648-g9cab056 build

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 9861294bd689f58ce95897a6740997ffeef6c52f..48d6013bf938ca071a3f96c3bd8adf7c20b3b8b6 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,7 +31,7 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)

-    autoprefixer-rails (3.1.0.20140911)
+    autoprefixer-rails (3.1.1.20141001)

       execjs
     bigdecimal (1.1.0)
     builder (3.2.2)
       execjs
     bigdecimal (1.1.0)
     builder (3.2.2)


@@ -54,8 +54,8 @@ GEM
       execjs
     coffee-script-source (1.8.0)
     colorize (0.7.3)
       execjs
     coffee-script-source (1.8.0)
     colorize (0.7.3)

-    composite_primary_keys (7.0.10)
-      activerecord (~> 4.1.4)
+    composite_primary_keys (7.0.11)
+      activerecord (= 4.1.6)

     crass (0.2.1)
     dalli (2.7.2)
     deadlock_retry (1.2.0)
     crass (0.2.1)
     dalli (2.7.2)
     deadlock_retry (1.2.0)


@@ -90,7 +90,7 @@ GEM
     libxml-ruby (2.7.0)
     mail (2.6.1)
       mime-types (>= 1.16, < 3)
     libxml-ruby (2.7.0)
     mail (2.6.1)
       mime-types (>= 1.16, < 3)

-    mime-types (2.3)
+    mime-types (2.4.1)

     mini_portile (0.6.0)
     minitest (5.4.2)
     multi_json (1.10.1)
     mini_portile (0.6.0)
     minitest (5.4.2)
     multi_json (1.10.1)


@@ -190,7 +190,7 @@ GEM
     validates_email_format_of (1.6.1)
       i18n
     vendorer (0.1.16)
     validates_email_format_of (1.6.1)
       i18n
     vendorer (0.1.16)

-    websocket-driver (0.3.4)
+    websocket-driver (0.3.5)

     xpath (2.0.0)
       nokogiri (~> 1.3)
 
     xpath (2.0.0)
       nokogiri (~> 1.3)
 


@@ -203,7 +203,7 @@ DEPENDENCIES
   autoprefixer-rails
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.0.0)
   autoprefixer-rails
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.0.0)

-  composite_primary_keys (~> 7.0.10)
+  composite_primary_keys (~> 7.0.11)

   dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form
   dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form