git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14656 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/3.0.6
@@ -5,7 +5,7 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0') | |||
end | |||
gem "rails", "4.2.3" | |||
gem "jquery-rails", "~> 3.1.3" | |||
gem "jquery-rails", "~> 3.1.4" | |||
gem "coderay", "~> 1.1.0" | |||
gem "builder", ">= 3.0.4" | |||
gem "request_store", "1.0.5" |
@@ -1256,7 +1256,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 |