diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-04-21 23:46:32 +0900 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-21 16:46:32 +0200 |
| commit | 60a9b938b408b934edbe7315ec85bb9133deefe4 (patch) | |
| tree | 3cadcb3f564a817feaf0d8b4cc3d9e7b166f985e /app/assets/javascripts | |
| parent | dd517b9a552ff82180901e58e14e2206a7c6f478 (diff) | |
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.
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/application.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/application_public.js | 2 |
2 files changed, 2 insertions, 2 deletions
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 |