From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 30 Sep 2011 08:14:30 +0000 (+0000)
Subject: Rails3: helper: use html_safe for Mercurial setting
X-Git-Tag: 1.3.0~428
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=163588887f9eff3a022e5625bb9605edb266b8db;p=redmine.git

Rails3: helper: use html_safe for Mercurial setting

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

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 703277adb..6556ee214 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -213,12 +213,12 @@ module RepositoriesHelper
                        :size => 60, :required => true,
                        :disabled => (repository && !repository.root_url.blank?)
                          ) +
-                     '<br />' + l(:text_mercurial_repository_note)) +
+                     '<br />'.html_safe + l(:text_mercurial_repository_note)) +
     content_tag('p', form.select(
                         :path_encoding, [nil] + Setting::ENCODINGS,
                         :label => l(:field_scm_path_encoding)
                         ) +
-                     '<br />' + l(:text_scm_path_encoding_note))
+                     '<br />'.html_safe + l(:text_scm_path_encoding_note))
   end
 
   def git_field_tags(form, repository)