From 061231ec7e799602e10c0e461642cd5e43898da2 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 11 Dec 2019 17:31:35 +0000 Subject: [PATCH] Switch back to the upstream actionpack-page_caching gem --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index dd3a8170b..ef4e47bda 100644 --- 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 91c20bb73..5160d5fac 100644 --- 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 -- 2.39.5