Download as
Browse Code »

Commit 87bd3f7aada1edb8622716b159ac1b38c5fa3f90

Authored by Leandro Santos
1 parent 4f262d0c
Exists in staging and in 14 other branches all_pending_tasks_api, api_roles, elasticsearch, elasticsearch_to_merge, environment-exposes-api, external_followers, federation_oauth_provider, follower_permition, master, oauth_external_login, private-scraps-rebase, production, profile_api_improvements, user_mention

should not escape html notification for article creation

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/views/person_notifier/mailer/_create_article.html.erb
  Diff comments   View file @87bd3f7
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <td> 5 <td>
6 <p> 6 <p>
7 <span style="font-size: 14px;"><%= link_to activity.user.short_name(20), activity.user.url %></span> 7 <span style="font-size: 14px;"><%= link_to activity.user.short_name(20), activity.user.url %></span>
8 - <span style="font-size: 14px;"><%= _("has published on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url, :style => "color: #333; font-weight: bold; text-decoration: none;") if activity.target.profile.is_a?(Community) %></span> 8 + <span style="font-size: 14px;"><%= _("has published on community %s").html_safe % link_to(activity.target.profile.short_name(20), activity.target.profile.url, :style => "color: #333; font-weight: bold; text-decoration: none;") if activity.target.profile.is_a?(Community) %></span>
9 <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_in_words(activity.created_at) %></span> 9 <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_in_words(activity.created_at) %></span>
10 </p> 10 </p>
11 <p> 11 <p>
app/views/person_notifier/mailer/content_summary.html.erb
  Diff comments   View file @87bd3f7
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <%= link_to @url, :style => "text-decoration: none;" do %> 5 <%= link_to @url, :style => "text-decoration: none;" do %>
6 <span style="font-weight:bold;font-size: 28px;margin: 0;color: white;background-color: #AAAAAA;padding: 5px;"><%= @environment.name %></span> 6 <span style="font-weight:bold;font-size: 28px;margin: 0;color: white;background-color: #AAAAAA;padding: 5px;"><%= @environment.name %></span>
7 <% end %> 7 <% end %>
8 - <span style="font-weight:bold;color: #333;font-size:19px;margin-left: 8px;"><%= _("%s's Notifications") % @profile.name %></h3> 8 + <span style="font-weight:bold;color: #333;font-size:19px;margin-left: 8px;"><%= _("%s's Notifications").html_safe % @profile.name %></h3>
9 </div> 9 </div>
10 <div style="margin: 0 20px 20px 20px;border-top:1px solid #e2e2e2;"> 10 <div style="margin: 0 20px 20px 20px;border-top:1px solid #e2e2e2;">
11 <% if @tasks.present? %> 11 <% if @tasks.present? %>
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 34
35 <div style="color:#444444;font-size:11px;margin-bottom: 20px;"> 35 <div style="color:#444444;font-size:11px;margin-bottom: 20px;">
36 <p style="margin:0"><%= _("Greetings,") %></p> 36 <p style="margin:0"><%= _("Greetings,") %></p>
37 - <p style="margin:0"><%= _('%s team.') % @environment.name %></p> 37 + <p style="margin:0"><%= _('%s team.').html_safe % @environment.name %></p>
38 <p style="margin:0"><%= link_to @url, url_for(@url) %></p> 38 <p style="margin:0"><%= link_to @url, url_for(@url) %></p>
39 </div> 39 </div>
40 </div> 40 </div>