Adds event target title to relevant event partials

5 files changed, 11 insertions, 27 deletions

diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index be782202da0..693a0cff558 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -66,6 +66,7 @@
     line-height: 16px;
     display: flex;
     align-items: center;
+    flex-wrap: wrap;
 
     .event-type {
       display: inline-block;
@@ -78,7 +79,8 @@
     .system-note-image-inline,
     .event-type,
     .ref-name,
-    .event-target-link {
+    .event-target-link,
+    .event-target-title {
       margin-right: 4px;
     }
   }
@@ -222,7 +224,8 @@
       .system-note-image-inline,
       .event-type,
       .ref-name,
-      .event-target-link {
+      .event-target-link,
+      .event-target-title {
         margin-right: 0;
       }
     }
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index 2f8f56a98f1..2fcb1d1fd2b 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -9,8 +9,6 @@
       = render "events/event/push", event: event
     - elsif event.commented?
       = render "events/event/note", event: event
-    - elsif event.merge_request? && (event.created? || event.closed?)
-      = render "events/event/merge_request", event: event
     - else
       = render "events/event/common", event: event
 - elsif @user&.include_private_contributions?
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index 7741004884e..4e40bbde0c4 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -10,13 +10,14 @@
     = 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
   - 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
+-#- if event.target.respond_to?(:title)
+-#  .event-body
+-#    .event-note
+-#      = event.target.title
diff --git a/app/views/events/event/_merge_request.html.haml b/app/views/events/event/_merge_request.html.haml
deleted file mode 100644
index 0b3431e3858..00000000000
--- a/app/views/events/event/_merge_request.html.haml
+++ /dev/null
@@ -1,18 +0,0 @@
-= icon_for_profile_event(event)
-
-= event_user_info(event)
-
-.event-title
-  = inline_event_icon(event)
-  - if event.target
-    %span.event-type{ class: event.action_name }
-      = event.action_name
-    = 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
-    = event.target.title
-  - else
-    %span.event-type{ class: event.action_name }
-      = event_action_name(event)
-
-  = render "events/event_scope", event: event
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index 8b6054e38c8..218560e4bfd 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)
-  = event.target.title
+  %span.event-target-title= event.target.title
 
   = render "events/event_scope", event: event