From 5d9ec3284ea0ae7d8249da0f75747a262a40bc14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Apr 2020 04:45:51 +0000 Subject: [PATCH 1/2] Bump jquery from 3.4.1 to 3.5.0 Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.0) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e5345bc97..b429aa503 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "fullcalendar": "2.3.1", "holderjs": "2.6", "jasny-bootstrap": "3.1", - "jquery": ">=3.4.0", + "jquery": ">=3.5.0", "jquery-minicolors": "^2.1.10", "medium-editor": "4.4.0", "moment": "2.22", diff --git a/yarn.lock b/yarn.lock index 540b24963..2a08e766a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1002,10 +1002,10 @@ jquery-minicolors@^2.1.10: dependencies: jquery ">= 1.7.x" -"jquery@>= 1.7.x", jquery@>=1.7.1, jquery@>=1.9.0, jquery@>=3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" - integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== +"jquery@>= 1.7.x", jquery@>=1.7.1, jquery@>=1.9.0, jquery@>=3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9" + integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ== js-tokens@^4.0.0: version "4.0.0" From bc99ac0ebb37094b3986cab1152f80cdf9e1f7d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 May 2020 16:30:40 +0000 Subject: [PATCH 2/2] Bump actionpack-page_caching from 1.1.0 to 1.2.1 Bumps [actionpack-page_caching](https://github.com/rails/actionpack-page_caching) from 1.1.0 to 1.2.1. - [Release notes](https://github.com/rails/actionpack-page_caching/releases) - [Changelog](https://github.com/rails/actionpack-page_caching/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/actionpack-page_caching/compare/v1.1.0...v1.2.1) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index dfe35d9bd..7c610d531 100644 --- a/Gemfile +++ b/Gemfile @@ -122,7 +122,7 @@ gem 'pundit' gem 'oj' -gem 'actionpack-page_caching', '1.1.0' +gem 'actionpack-page_caching', '1.2.1' gem 'rails-observers' gem 'chroma' diff --git a/Gemfile.lock b/Gemfile.lock index 5513821f6..3973c72c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,8 +39,8 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionpack-page_caching (1.1.0) - actionpack (>= 4.0.0, < 6) + actionpack-page_caching (1.2.1) + actionpack (>= 5.0.0) actionview (5.2.4.2) activesupport (= 5.2.4.2) builder (~> 3.1) @@ -221,7 +221,7 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.4.0) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -432,7 +432,7 @@ GEM camertron-eprun cldr-plurals-runtime-rb (~> 1.0) tzinfo - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -463,7 +463,7 @@ PLATFORMS DEPENDENCIES aasm - actionpack-page_caching (= 1.1.0) + actionpack-page_caching (= 1.2.1) active_record_query_trace api-pagination apipie-rails