From 97e06bcfe661ca138c3d7f5a810783e5ec7596f5 Mon Sep 17 00:00:00 2001 From: Kyle Fazzari Date: Thu, 29 May 2014 07:37:28 -0700 Subject: [PATCH 1/2] Update events helper to also return a URL for notes. This fixes #304 since it was linking back to the dashboard feed only as a result of it being given no URL at all for notes. --- app/helpers/events_helper.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 929f9a9c381..4ae3df3d16f 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -64,7 +64,18 @@ module EventsHelper project_issue_url(event.project, event.issue) elsif event.merge_request? project_merge_request_url(event.project, event.merge_request) - + elsif event.note? + if event.note_target + if event.note_commit? + project_commit_path(event.project, event.note_commit_id, anchor: dom_id(event.target)) + elsif event.note_project_snippet? + project_snippet_path(event.project, event.note_target) + else + event_note_target_path(event) + end + elsif event.wall_note? + project_wall_path(event.project) + end elsif event.push? if event.push_with_commits? if event.commits_count > 1 From 420b46eedf03bdcaaa4177b9db7b8c39162fe40c Mon Sep 17 00:00:00 2001 From: Kyle Fazzari Date: Wed, 25 Jun 2014 10:50:16 -0400 Subject: [PATCH 2/2] Update events helper to remove wall-related sections. --- app/helpers/events_helper.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 4ae3df3d16f..ede19faf8c9 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -73,8 +73,6 @@ module EventsHelper else event_note_target_path(event) end - elsif event.wall_note? - project_wall_path(event.project) end elsif event.push? if event.push_with_commits?