Upgrade jQuery to v2.x (#2246)

Fix #2199 and minifying assets file.

jQuery v1.x is supports legacy browsers.
But, Mastodon does not support legacy browsers.
I think jQuery v1.x is unnecessary.

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e2fffd9320d9666287a5e42730d6c40185d51e1a..4412828259690c64182c5e78709a771303e0b69d 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -10,6 +10,6 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
+//= require jquery2
 //= require jquery_ujs
 //= require components

diff --git a/app/assets/javascripts/application_public.js b/app/assets/javascripts/application_public.js
index 9626c5dae1ad3b42b3c1f6a072fc0578d499242c..ae151a301daad348de25199a9178e0850875836d 100644 (file)
--- a/app/assets/javascripts/application_public.js
+++ b/app/assets/javascripts/application_public.js
@@ -1,4 +1,4 @@
-//= require jquery
+//= require jquery2
 //= require jquery_ujs
 //= require extras
 //= require best_in_place