diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-02 07:00:16 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-02 07:00:16 +0000 |
| commit | 119b02877dbdd40d45727d2adc0a76579ae829ac (patch) | |
| tree | 0bf6ae812031cd5b9099720cb917898e8bf20d11 /app/helpers/events_helper.rb | |
| parent | 54e69988a5dc24382ba443b52ce0b3c775e24e8d (diff) | |
| parent | 1f976a646d1439e41925ec83dc2ea92d48370831 (diff) | |
| download | gitlab-ce-119b02877dbdd40d45727d2adc0a76579ae829ac.tar.gz | |
Merge branch 'bugfix/305/dashboard_feed_summaries' into 'master'
Incorporate Summaries for Notes and Merge Requests Into Dashboard Feed
This MR fixes #305 by adding summaries for notes and merge requests into the dashboard feed.
Diffstat (limited to 'app/helpers/events_helper.rb')
| -rw-r--r-- | app/helpers/events_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 91c18ff8f95..c7e8fdad7a0 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -92,6 +92,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 |