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.
This commit is contained in:
commit
119b02877d
|
@ -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
|
||||
|
||||
|
|
|
@ -30,6 +30,7 @@ class Event < ActiveRecord::Base
|
|||
delegate :name, :email, to: :author, prefix: true, allow_nil: true
|
||||
delegate :title, to: :issue, prefix: true, allow_nil: true
|
||||
delegate :title, to: :merge_request, prefix: true, allow_nil: true
|
||||
delegate :title, to: :note, prefix: true, allow_nil: true
|
||||
|
||||
belongs_to :author, class_name: "User"
|
||||
belongs_to :project
|
||||
|
@ -147,6 +148,10 @@ class Event < ActiveRecord::Base
|
|||
target if target_type == "MergeRequest"
|
||||
end
|
||||
|
||||
def note
|
||||
target if target_type == "Note"
|
||||
end
|
||||
|
||||
def action_name
|
||||
if closed?
|
||||
"closed"
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
%div{:xmlns => "http://www.w3.org/1999/xhtml"}
|
||||
%p= simple_format issue.description
|
||||
%p= markdown issue.description
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
%div{xmlns: "http://www.w3.org/1999/xhtml"}
|
||||
%p= markdown merge_request.description
|
|
@ -0,0 +1,2 @@
|
|||
%div{:xmlns => "http://www.w3.org/1999/xhtml"}
|
||||
%p= markdown note.note
|
|
@ -6,7 +6,7 @@
|
|||
%i
|
||||
at
|
||||
= commit[:timestamp].to_time.to_s(:short)
|
||||
%blockquote= simple_format(escape_once(commit[:message]))
|
||||
%blockquote= markdown(escape_once(commit[:message]))
|
||||
- if event.commits_count > 15
|
||||
%p
|
||||
%i
|
||||
|
|
Loading…
Reference in New Issue