summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-06-28 09:19:25 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-06-28 09:19:25 +0000
commitf745102e4d43917d1cf69fcc090cfd47ad53931c (patch)
tree3dce8a36cdace89b4572c475cfa5c4651d97ada9 /app
parent0cac2b85b325e00c861b2c9a0e94407ed0bb077b (diff)
downloadredmine-f745102e4d43917d1cf69fcc090cfd47ad53931c.tar.gz
redmine-f745102e4d43917d1cf69fcc090cfd47ad53931c.zip
Merged r14381.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14384 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 916bdf1fb..4df4a8b65 100644
--- 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