Merged r14381.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14384 e93f8b46-1217-0410-a6f0-8f06a7374b81
2026-02-20 05:27:43 +01:00 · 2015-06-28 09:19:25 +00:00
parent 0cac2b85b3
commit f745102e4d
2 changed files with 3 additions and 3 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1298,7 +1298,7 @@ module ApplicationHelper

  # Returns the javascript tags that are included in the html layout head
  def javascript_heads
-    tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-3.1.1', 'application')
+    tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-3.1.3', 'application')
    unless User.current.pref.warn_on_leaving_unsaved == '0'
      tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
    end
--- a/public/javascripts/jquery-1.11.1-ui-1.11.0-ujs-3.1.3.js
+++ b/public/javascripts/jquery-1.11.1-ui-1.11.0-ujs-3.1.3.js