diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-07 05:23:52 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-07 05:23:52 +0000 |
| commit | 5981aee06de058dcbb4ffc0a898c80aea6835f2a (patch) | |
| tree | a6047059a1a2a959c7df710f8b22551f2f18846e /app | |
| parent | 232edc62372730de6045e958821c16dee14ac65f (diff) | |
| download | redmine-5981aee06de058dcbb4ffc0a898c80aea6835f2a.tar.gz redmine-5981aee06de058dcbb4ffc0a898c80aea6835f2a.zip | |
Fixed: escaped link in conflict resolution form (#11341).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9925 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/issues/_conflict.html.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/issues/_conflict.html.erb b/app/views/issues/_conflict.html.erb index dcf4c3f75..d2e2a67c4 100644 --- a/app/views/issues/_conflict.html.erb +++ b/app/views/issues/_conflict.html.erb @@ -21,6 +21,6 @@ <% if @notes.present? %> <label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br /> <% end %> - <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)) %></label> + <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)).html_safe %></label> </p> <p><%= submit_tag l(:button_submit) %></p> |