diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-05-08 14:05:45 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-05-16 14:52:02 -0500 |
commit | 6286b28bbc9b62af729c45c45f953f5426f5bf52 (patch) | |
tree | b2d7ad6bc4439708c400b8866b064aa2450a8c32 /app | |
parent | a511a122651643ea5169d50fe09b9a89b6320aa2 (diff) | |
download | gitlab-ce-6286b28bbc9b62af729c45c45f953f5426f5bf52.tar.gz |
Add an Event's target's title to its reference link
Given an activity feed entry like:
> Douwe Maan commented on [issue #123] at [gitlab-org/gitlab-ce]
...the `issue #123` link will now have a `title` attribute.
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/events_helper.rb | 2 | ||||
-rw-r--r-- | app/models/event.rb | 2 | ||||
-rw-r--r-- | app/models/note.rb | 1 | ||||
-rw-r--r-- | app/views/events/event/_common.html.haml | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 0bf328e7d19..2b33889b46a 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -162,7 +162,7 @@ module EventsHelper "#{event.note_target_type} #{truncate event.note_target.to_reference}" end else - link_to event_note_target_path(event) do + link_to event_note_target_path(event), title: event.target_title do "#{event.note_target_type} #{truncate event.note_target.to_reference}" end end diff --git a/app/models/event.rb b/app/models/event.rb index 17ee48b91a8..b54fbe6f7e8 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -80,7 +80,7 @@ class Event < ActiveRecord::Base end def target_title - target.title if target && target.respond_to?(:title) + target.try(:title) end def created? diff --git a/app/models/note.rb b/app/models/note.rb index 7e5bdc09a84..55b98557244 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -19,6 +19,7 @@ class Note < ActiveRecord::Base delegate :gfm_reference, :local_reference, to: :noteable delegate :name, to: :project, prefix: true delegate :name, :email, to: :author, prefix: true + delegate :title, to: :noteable, allow_nil: true before_validation :set_award! diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index c994e3b997d..f9f623cc031 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -4,7 +4,7 @@ = event_action_name(event) - if event.target - %strong= link_to event.target.reference_link_text, [event.project.namespace.becomes(Namespace), event.project, event.target] + %strong= link_to event.target.reference_link_text, [event.project.namespace.becomes(Namespace), event.project, event.target], title: event.target_title = event_preposition(event) |