github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-01-10 15:48:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update jquery to 3.5.1 (jquery-rails 4.4.0 and rails-assets-jquery 3.5.1)

Browse Source
This commit is contained in:
Pirate Praveen
2020-10-04 13:38:59 +05:30
committed by Benjamin Neff
parent 43d489edda
commit 77edc5105e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@@ -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"

8
Gemfile.lock
View File

@@ -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)!