Merge remote-tracking branch 'upstream/pull/4635'

diff --git a/app/views/diary_entries/subscribe.html.erb b/app/views/diary_entries/subscribe.html.erb
index e18be2b6d31b334b86b842a660ad2f71c4561d85..62d734ff2f017e5ada3ddbdb8283ee3f11687015 100644 (file)
--- a/app/views/diary_entries/subscribe.html.erb
+++ b/app/views/diary_entries/subscribe.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h1><%= t ".heading", :user => @diary_entry.user.display_name %></h1>
+  <h1><%= t ".heading" %></h1>
 <% end %>
 
 <%= render :partial => "diary_entry_heading", :object => @diary_entry, :as => "diary_entry" %>

diff --git a/app/views/diary_entries/unsubscribe.html.erb b/app/views/diary_entries/unsubscribe.html.erb
index e18be2b6d31b334b86b842a660ad2f71c4561d85..62d734ff2f017e5ada3ddbdb8283ee3f11687015 100644 (file)
--- a/app/views/diary_entries/unsubscribe.html.erb
+++ b/app/views/diary_entries/unsubscribe.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h1><%= t ".heading", :user => @diary_entry.user.display_name %></h1>
+  <h1><%= t ".heading" %></h1>
 <% end %>
 
 <%= render :partial => "diary_entry_heading", :object => @diary_entry, :as => "diary_entry" %>