Switch to fork of actionpack-page_caching with rails 6 support

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index dd6ddfc88bae93ccd705bf9c987b768a2ce060d0..4787a52ec4b748b07a0011d2041a10deaae3c0fd 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,8 +21,6 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionpack-page_caching (1.1.1)
-      actionpack (>= 4.0.0, < 6)
     actionview (5.2.3)
       activesupport (= 5.2.3)
       builder (~> 3.1)
@@ -221,17 +219,14 @@ GEM
     image_size (2.0.2)
     in_threads (1.5.3)
     jaro_winkler (1.5.4)
+    jbuilder (2.9.1)
+      activesupport (>= 4.2.0)
     jmespath (1.4.0)
     jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.2.0)
-    jsonify (0.3.1)
-      multi_json (~> 1.0)
-    jsonify-rails (0.3.2)
-      actionpack
-      jsonify (< 0.4.0)
     jwt (2.2.1)
     kgio (2.11.2)
     kramdown (2.1.0)
@@ -305,6 +300,8 @@ GEM
     omniauth-windowslive (0.0.12)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
+    openstreetmap-actionpack-page_caching (1.1.2)
+      actionpack (>= 5.0.0)
     openstreetmap-deadlock_retry (1.3.0)
     parallel (1.19.0)
     parser (2.6.5.0)
@@ -445,7 +442,6 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   aasm
-  actionpack-page_caching
   active_record_union
   activerecord-import
   annotate
@@ -478,9 +474,9 @@ DEPENDENCIES
   http_accept_language (~> 2.0.0)
   i18n-js (>= 3.0.0)
   image_optim_rails
+  jbuilder (~> 2.7)
   jquery-rails
   json
-  jsonify-rails
   kgio
   kramdown
   libxml-ruby (>= 2.0.5)
@@ -497,6 +493,7 @@ DEPENDENCIES
   omniauth-mediawiki (>= 0.0.4)
   omniauth-openid
   omniauth-windowslive
+  openstreetmap-actionpack-page_caching (>= 1.1.2)
   openstreetmap-deadlock_retry (>= 1.3.0)
   pg
   poltergeist