Merged r14654 (#20380).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14657 e93f8b46-1217-0410-a6f0-8f06a7374b81

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem "rails", "3.2.22"
-gem "jquery-rails", "~> 3.1.3"
+gem "jquery-rails", "~> 3.1.4"
 gem "coderay", "~> 1.1.0"
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 gem "builder", ">= 3.0.4"

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.3', 'application')
+    tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-3.1.4', '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