summaryrefslogtreecommitdiff
path: root/app/helpers/events_helper.rb
diff options
context:
space:
mode:
authorKyle Fazzari <gitlab_cloud@status.e4ward.com>2014-05-29 07:37:28 -0700
committerKyle Fazzari <gitlab_cloud@status.e4ward.com>2014-05-29 07:37:28 -0700
commit97e06bcfe661ca138c3d7f5a810783e5ec7596f5 (patch)
treebed7365860ef42201183bd704d3942843e4714e9 /app/helpers/events_helper.rb
parentb1ce97d5a1b3890e4137212547d97f3ab38c3991 (diff)
downloadgitlab-ce-97e06bcfe661ca138c3d7f5a810783e5ec7596f5.tar.gz
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.
Diffstat (limited to 'app/helpers/events_helper.rb')
-rw-r--r--app/helpers/events_helper.rb13
1 files changed, 12 insertions, 1 deletions
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