summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2022-06-17 07:12:43 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2022-06-17 07:12:43 +0000
commitfd8d8ba18cf297aa9d51e87f4bad21605a393a2e (patch)
tree5681fde03680d171d8d8a3d8fe9d7b031696ceef /app
parentb489758fd903393b9c4f3450f74da90555a89d31 (diff)
downloadredmine-fd8d8ba18cf297aa9d51e87f4bad21605a393a2e.tar.gz
redmine-fd8d8ba18cf297aa9d51e87f4bad21605a393a2e.zip
Merged r21647 to 5.0-stable (#37256).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21650 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb2
-rw-r--r--app/views/layouts/base.html.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4f2debeb7..4ddbf650a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1725,7 +1725,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.12.1-ujs-6.1.3.1',
+ 'jquery-3.6.0-ui-1.13.1-ujs-6.1.3.1',
'tribute-5.1.3.min',
'tablesort-5.2.1.min.js',
'tablesort-5.2.1.number.min.js',
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index a7ca52c22..8114ff9e0 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -9,7 +9,7 @@
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.12.1', 'tribute-5.1.3', 'application', 'responsive', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.13.1', 'tribute-5.1.3', 'application', 'responsive', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= heads_for_theme %>