Switch back to the upstream actionpack-page_caching gem

diff --git a/Gemfile b/Gemfile
index dd3a8170b2e0b97239a77c6c1ebe3635ca6fa46f..ef4e47bda0ab85da4370888bb35079b064774e98 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -50,7 +50,7 @@ gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"
-gem "openstreetmap-actionpack-page_caching", ">= 1.1.2", :require => "actionpack/page_caching"
+gem "actionpack-page_caching", ">= 1.2.0"
 gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"

diff --git a/Gemfile.lock b/Gemfile.lock
index 91c20bb735d023a43927fbb106fd9d39fca8867d..5160d5fac6761779dd3c66e0bf881b9f843e9d4e 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,6 +28,8 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionpack-page_caching (1.2.0)
+      actionpack (>= 5.0.0)
     actiontext (6.0.1)
       actionpack (= 6.0.1)
       activerecord (= 6.0.1)
@@ -308,8 +310,6 @@ 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.1)
     parser (2.6.5.0)
@@ -456,6 +456,7 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   aasm
+  actionpack-page_caching (>= 1.2.0)
   active_record_union
   activerecord-import
   annotate
@@ -506,7 +507,6 @@ 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