Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Fazzari <gitlab_cloud@status.e4ward.com>2014-05-29 18:55:55 +0400
committerKyle Fazzari <gitlab_cloud@status.e4ward.com>2014-05-29 18:55:55 +0400
commitc1b1c321962de51090d590dc40fc2784aaa0d561 (patch)
treefd15124703486490f2ee7836064dcc0b85633fd4 /app/helpers/events_helper.rb
parentb1ce97d5a1b3890e4137212547d97f3ab38c3991 (diff)
Add summaries for notes and merge requests to dashboard feed.
This fixes #305.
Diffstat (limited to 'app/helpers/events_helper.rb')
-rw-r--r--app/helpers/events_helper.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 929f9a9c381..63210324a19 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -83,6 +83,10 @@ module EventsHelper
render "events/event_issue", issue: event.issue
elsif event.push?
render "events/event_push", event: event
+ elsif event.merge_request?
+ render "events/event_merge_request", merge_request: event.merge_request
+ elsif event.note?
+ render "events/event_note", note: event.note
end
end