Merged r21811 and r21812 to 5.0-stable (#37647).

git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21813 e93f8b46-1217-0410-a6f0-8f06a7374b81
2026-03-11 03:33:07 +00:00 · 2022-09-14 20:59:46 +00:00 · 2022-09-14 20:59:46 +00:00 · bbfb09ba48
commit bbfb09ba48
parent f97e24398c
2 changed files with 8 additions and 8 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -1726,7 +1726,7 @@ module ApplicationHelper
  # Returns the javascript tags that are included in the html layout head
  def javascript_heads
    tags = javascript_include_tag(
-      'jquery-3.6.0-ui-1.13.2-ujs-6.1.3.1',
+      'jquery-3.6.1-ui-1.13.2-ujs-6.1.7',
      'tribute-5.1.3.min',
      'tablesort-5.2.1.min.js',
      'tablesort-5.2.1.number.min.js',
--- a/public/javascripts/jquery-3.6.0-ui-1.13.2-ujs-6.1.3.1.js
+++ b/public/javascripts/jquery-3.6.0-ui-1.13.2-ujs-6.1.3.1.js