diff options
| author | Matthew McMillion <matthew@mcmillion.io> | 2014-07-26 21:43:04 +0400 |
|---|---|---|
| committer | Matthew McMillion <matthew@mcmillion.io> | 2014-07-26 21:43:04 +0400 |
| commit | afc5b7110fbabc2ec0f4a5de0ddcf98565a1a3fb (patch) | |
| tree | f0c4f2cc2383a791e50c46ad04c5affe322f8a09 /app | |
| parent | cb0d63b9e3fa464ae8c0cd9cf7bdb8d080a7e02f (diff) | |
Fix missing links and incorrect display of issue numbers for notes, comments, and merge requests
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/events_helper.rb | 6 | ||||
| -rw-r--r-- | app/views/events/_event_issue.atom.haml | 4 | ||||
| -rw-r--r-- | app/views/events/_event_merge_request.atom.haml | 2 | ||||
| -rw-r--r-- | app/views/events/_event_note.atom.haml | 4 |
4 files changed, 11 insertions, 5 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index c7e8fdad7a0..a4f93689a7b 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -52,6 +52,8 @@ module EventsHelper "#{event.author_name} #{event.push_action_name} #{event.ref_type} #{event.ref_name} at #{event.project_name}" elsif event.membership_changed? "#{event.author_name} #{event.action_name} #{event.project_name}" + elsif event.note? && event.note_commit? + "#{event.author_name} commented on #{event.note_target_type} #{event.note_short_commit_id} at #{event.project_name}" elsif event.note? "#{event.author_name} commented on #{event.note_target_type} ##{truncate event.note_target_iid} at #{event.project_name}" else @@ -64,6 +66,8 @@ 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? && event.note_commit? + project_commit_url(event.project, event.note_target) elsif event.note? if event.note_target if event.note_commit? @@ -94,6 +98,8 @@ module EventsHelper render "events/event_push", event: event elsif event.merge_request? render "events/event_merge_request", merge_request: event.merge_request + elsif event.push? + render "events/event_push", event: event elsif event.note? render "events/event_note", note: event.note end diff --git a/app/views/events/_event_issue.atom.haml b/app/views/events/_event_issue.atom.haml index 56801107d05..030c961c355 100644 --- a/app/views/events/_event_issue.atom.haml +++ b/app/views/events/_event_issue.atom.haml @@ -1,2 +1,2 @@ -%div{:xmlns => "http://www.w3.org/1999/xhtml"} - %p= markdown issue.description +%div{xmlns: "http://www.w3.org/1999/xhtml"} + = markdown issue.description diff --git a/app/views/events/_event_merge_request.atom.haml b/app/views/events/_event_merge_request.atom.haml index dea256bb7f2..ab3a485e908 100644 --- a/app/views/events/_event_merge_request.atom.haml +++ b/app/views/events/_event_merge_request.atom.haml @@ -1,2 +1,2 @@ %div{xmlns: "http://www.w3.org/1999/xhtml"} - %p= markdown merge_request.description + = markdown merge_request.description diff --git a/app/views/events/_event_note.atom.haml b/app/views/events/_event_note.atom.haml index 96039ad18dc..be0e05481ed 100644 --- a/app/views/events/_event_note.atom.haml +++ b/app/views/events/_event_note.atom.haml @@ -1,2 +1,2 @@ -%div{:xmlns => "http://www.w3.org/1999/xhtml"} - %p= markdown note.note +%div{xmlns: "http://www.w3.org/1999/xhtml"} + = markdown note.note |