From b34e976bb5d6f9ee590664a79cb4dc4a4eb47c06 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 24 Nov 2019 10:41:33 +0000 Subject: [PATCH] Switch to fork of actionpack-page_caching with rails 6 support --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index d157a3ecc..6597a3891 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ gem "autoprefixer-rails", "~> 8.6.3" gem "image_optim_rails" # Load rails plugins -gem "actionpack-page_caching" +gem "openstreetmap-actionpack-page_caching", ">= 1.1.2", :require => "actionpack/page_caching" gem "active_record_union" gem "activerecord-import" gem "cancancan" diff --git a/Gemfile.lock b/Gemfile.lock index 147ab83e5..4787a52ec 100644 --- 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) @@ -302,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) @@ -442,7 +442,6 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) aasm - actionpack-page_caching active_record_union activerecord-import annotate @@ -494,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 -- 2.45.1