From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 21 Apr 2017 14:46:32 +0000 (+0900)
Subject: Upgrade jQuery to v2.x (#2246)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=60a9b938b408b934edbe7315ec85bb9133deefe4;p=mastodon.git

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 e2fffd932..441282825 100644
--- 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 9626c5dae..ae151a301 100644
--- 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