Upgrade to Rails 3.2.8 (#11758).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10275 e93f8b46-1217-0410-a6f0-8f06a7374b81

5 files changed, 5 insertions, 5 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2706cef78..a0e9cac92 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1206,7 +1206,7 @@ module ApplicationHelper
 
   # Returns the javascript tags that are included in the html layout head
   def javascript_heads
-    tags = javascript_include_tag('jquery-1.7.2-ui-1.8.21-ujs-2.0.2', 'application')
+    tags = javascript_include_tag('jquery-1.7.2-ui-1.8.21-ujs-2.0.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
diff --git a/app/views/groups/edit_membership.js.erb b/app/views/groups/edit_membership.js.erb
index 6df0fbba9..679c99869 100644
--- a/app/views/groups/edit_membership.js.erb
+++ b/app/views/groups/edit_membership.js.erb
@@ -2,5 +2,5 @@
   $('#tab-content-memberships').html('<%= escape_javascript(render :partial => 'groups/memberships') %>');
   $('#member-<%= @membership.id %>').effect("highlight");
 <% else %>
-  alert('<%= escape_javascript(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', '))) %>');
+  alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))) %>');
 <% end %>
diff --git a/app/views/members/create.js.erb b/app/views/members/create.js.erb
index 7ca4930b5..11c468a76 100644
--- a/app/views/members/create.js.erb
+++ b/app/views/members/create.js.erb
@@ -7,5 +7,5 @@ hideOnLoad();
   <% end %>
 <% else %>
   <% errors = @members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ') %>
-  alert('<%= escape_javascript l(:notice_failed_to_save_members, :errors => errors) %>');
+  alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => errors))) %>');
 <% end %>
diff --git a/app/views/repositories/add_related_issue.js.erb b/app/views/repositories/add_related_issue.js.erb
index bc156ebc2..f3864d3be 100644
--- a/app/views/repositories/add_related_issue.js.erb
+++ b/app/views/repositories/add_related_issue.js.erb
@@ -3,5 +3,5 @@
   $('#related-issue-<%= @issue.id %>').effect("highlight");
   $('#issue_id').focus();
 <% else %>
-  alert("<%= escape_javascript(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid')) %>");
+  alert("<%= raw(escape_javascript(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid'))) %>");
 <% end %>
diff --git a/app/views/users/edit_membership.js.erb b/app/views/users/edit_membership.js.erb
index 94507567f..d9ad2f355 100644
--- a/app/views/users/edit_membership.js.erb
+++ b/app/views/users/edit_membership.js.erb
@@ -2,5 +2,5 @@
   $('#tab-content-memberships').html('<%= escape_javascript(render :partial => 'users/memberships') %>');
   $("#member-<%= @membership.id %>").effect("highlight");
 <% else %>
-  alert('<%= escape_javascript l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')) %>');
+  alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))) %>');
 <% end %>