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

diff --cc app/helpers/issues_helper.rb
index 092050bf1857f078ee52e35a08d276a01fd02e77,474249648bc5434dd77a575091c2e074fc695c8b..4ecd7001af131074ea3ca18de9fc4186e9ede2fe
--- 1/app/helpers/issues_helper.rb
--- 2/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@@ -2,11 -2,11 +2,11 @@@ module IssuesHelpe
    def reportable_url(reportable)
      case reportable
      when DiaryEntry
-       url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.user.display_name, :id => reportable.id)
+       diary_entry_url(reportable.user, reportable)
      when User
 -      url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name)
 +      user_url(reportable)
      when DiaryComment
-       url_for(:controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :anchor => "comment#{reportable.id}")
+       diary_entry_url(reportable.diary_entry.user, reportable.diary_entry, :anchor => "comment#{reportable.id}")
      when Note
        url_for(:controller => :browse, :action => :note, :id => reportable.id)
      end

diff --cc app/models/notifier.rb
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/routes.rb
Simple merge