Resolve UX discussions

4 files changed, 15 insertions, 16 deletions

diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index 452f67cd299..50631727bf7 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -77,6 +77,7 @@
     .system-note-image-inline,
     .event-type,
     .ref-name,
+    .event-target-type,
     .event-target-link,
     .event-target-title {
       margin-right: 4px;
@@ -222,6 +223,7 @@
       .system-note-image-inline,
       .event-type,
       .ref-name,
+      .event-target-type,
       .event-target-link,
       .event-target-title {
         margin-right: 0;
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index d3b88e76c2a..6da2e1dea33 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -163,14 +163,15 @@ module EventsHelper
 
   def event_note_title_html(event)
     if event.note_target
-      text = raw("#{event.note_target_type} ") +
-        if event.commit_note?
-          content_tag(:span, event.note_target_reference, class: 'commit-sha')
-        else
-          event.note_target_reference
-        end
-
-      link_to(text, event_note_target_url(event), title: event.target_title, class: 'has-tooltip event-target-link')
+      output = [];
+
+      output << content_tag(:span, class: "event-target-type") do
+        "#{event.note_target_type}"
+      end
+
+      output << link_to(event.note_target_reference, event_note_target_url(event), title: event.target_title, class: 'has-tooltip event-target-link');
+
+      output.join.html_safe
     else
       content_tag(:strong, '(deleted)')
     end
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index 4e40bbde0c4..474021626a8 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -7,17 +7,13 @@
   - if event.target
     %span.event-type{ class: event.action_name }
       = event.action_name
+    %span.event-target-type= event.target_type.titleize.downcase
     = link_to [event.project.namespace.becomes(Namespace), event.project, event.target], class: 'has-tooltip event-target-link', title: event.target_title do
-      = event.target_type.titleize.downcase
       = event.target.reference_link_text
-    %span.event-target-title= event.target.title
+    - unless event.milestone?
+      %span.event-target-title= "&quot;#{event.target.title}&quot".html_safe
   - else
     %span.event-type{ class: event.action_name }
       = event_action_name(event)
 
   = render "events/event_scope", event: event
-
--#- if event.target.respond_to?(:title)
--#  .event-body
--#    .event-note
--#      = event.target.title
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index 218560e4bfd..d3908261bb8 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -7,7 +7,7 @@
   %span.event-type{ class: event.action_name }
     = event.action_name
   = event_note_title_html(event)
-  %span.event-target-title= event.target.title
+  %span.event-target-title= "&quot;#{event.target.title}&quot".html_safe
 
   = render "events/event_scope", event: event