From 77edc5105eb3b5aad219b0d988dc51ec5e658d81 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Sun, 4 Oct 2020 13:38:59 +0530 Subject: [PATCH] Update jquery to 3.5.1 (jquery-rails 4.4.0 and rails-assets-jquery 3.5.1) --- Gemfile | 4 ++-- Gemfile.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index ac98f6f82..a363c4adf 100644 --- a/Gemfile +++ b/Gemfile @@ -94,12 +94,12 @@ gem "entypo-rails", "3.0.0" # JavaScript gem "handlebars_assets", "0.23.8" -gem "jquery-rails", "4.3.5" +gem "jquery-rails", "4.4.0" gem "js-routes", "1.4.9" gem "js_image_paths", "0.1.1" source "https://gems.diasporafoundation.org" do - gem "rails-assets-jquery", "3.4.1" # Should be kept in sync with jquery-rails + gem "rails-assets-jquery", "3.5.1" # Should be kept in sync with jquery-rails gem "rails-assets-jquery.ui", "1.11.4" gem "rails-assets-highlightjs", "9.12.0" diff --git a/Gemfile.lock b/Gemfile.lock index 730320fb3..4f8053454 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -348,7 +348,7 @@ GEM rake jasmine-core (3.7.1) jasmine-jquery-rails (2.0.3) - jquery-rails (4.3.5) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -556,7 +556,7 @@ GEM rails-assets-jasmine (3.4.0) rails-assets-jasmine-ajax (4.0.0) rails-assets-jasmine (~> 3) - rails-assets-jquery (3.4.1) + rails-assets-jquery (3.5.1) rails-assets-jquery-colorbox (1.6.4) rails-assets-jquery (>= 1.3.2) rails-assets-jquery-fullscreen-plugin (0.5.0) @@ -830,7 +830,7 @@ DEPENDENCIES i18n-inflector-rails (= 1.0.7) jasmine (= 3.7.0) jasmine-jquery-rails (= 2.0.3) - jquery-rails (= 4.3.5) + jquery-rails (= 4.4.0) js-routes (= 1.4.9) js_image_paths (= 0.1.1) json (= 2.3.0) @@ -875,7 +875,7 @@ DEPENDENCIES rails-assets-fine-uploader (= 5.13.0)! rails-assets-highlightjs (= 9.12.0)! rails-assets-jasmine-ajax (= 4.0.0)! - rails-assets-jquery (= 3.4.1)! + rails-assets-jquery (= 3.5.1)! rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! rails-assets-jquery.are-you-sure (= 1.9.0)!