Add latest changes from gitlab-org/gitlab@13-2-stable-ee

7 files changed, 24 insertions, 11 deletions

diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index c042cd2c3e3..83f7d743755 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -7,6 +7,8 @@
 
     - if event.wiki_page?
       = render "events/event/wiki", event: event
+    - elsif event.design?
+      = render 'events/event/design', event: event
     - elsif event.created_project_action?
       = render "events/event/created_project", event: event
     - elsif event.push_action?
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index 50c5885c648..dc16c46476e 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -5,16 +5,16 @@
 .event-title.d-flex.flex-wrap
   = inline_event_icon(event)
   - if event.target
-    %span.event-type.d-inline-block.append-right-4{ class: event.action_name }
+    %span.event-type.d-inline-block.gl-mr-2{ class: event.action_name }
       = event.action_name
-    %span.event-target-type.append-right-4= event.target_type.titleize.downcase
-    = link_to event.target_link_options, class: 'has-tooltip event-target-link append-right-4', title: event.target_title do
+    %span.event-target-type.gl-mr-2= event.target_type.titleize.downcase
+    = link_to event.target_link_options, class: 'has-tooltip event-target-link gl-mr-2', title: event.target_title do
       = event.target.reference_link_text
     - unless event.milestone?
-      %span.event-target-title.append-right-4{ dir: "auto" }
+      %span.event-target-title.gl-mr-2{ dir: "auto" }
         = """.html_safe + event.target.title + "&quot".html_safe
   - else
-    %span.event-type.d-inline-block.append-right-4{ class: event.action_name }
+    %span.event-type.d-inline-block.gl-mr-2{ class: event.action_name }
       = event_action_name(event)
 
   = render "events/event_scope", event: event if event.resource_parent.present?
diff --git a/app/views/events/event/_created_project.html.haml b/app/views/events/event/_created_project.html.haml
index 606b0febb57..f0bb07d062c 100644
--- a/app/views/events/event/_created_project.html.haml
+++ b/app/views/events/event/_created_project.html.haml
@@ -4,7 +4,7 @@
 
 .event-title.d-flex.flex-wrap
   = inline_event_icon(event)
-  %span.event-type.d-inline-block.append-right-4{ class: event.action_name }
+  %span.event-type.d-inline-block.gl-mr-2{ class: event.action_name }
     = event_action_name(event)
 
   - if event.project
diff --git a/app/views/events/event/_design.html.haml b/app/views/events/event/_design.html.haml
new file mode 100644
index 00000000000..c1fa1aaca50
--- /dev/null
+++ b/app/views/events/event/_design.html.haml
@@ -0,0 +1,11 @@
+= icon_for_profile_event(event)
+
+= event_user_info(event)
+
+.event-title.d-flex.flex-wrap
+  = inline_event_icon(event)
+  %span.event-type.d-inline-block.gl-mr-2{ class: event.action_name }
+    = event.action_name
+  = event_design_title_html(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 21e8b1401ca..a81b999acba 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -4,12 +4,12 @@
 
 .event-title.d-flex.flex-wrap
   = inline_event_icon(event)
-  %span.event-type.d-inline-block.append-right-4{ class: event.action_name }
+  %span.event-type.d-inline-block.gl-mr-2{ class: event.action_name }
     = event.action_name
   = event_note_title_html(event)
   - title = note_target_title(event.target)
   - if title.present?
-    %span.event-target-title.append-right-4{ dir: "auto" }
+    %span.event-target-title.gl-mr-2{ dir: "auto" }
       = """.html_safe + title + "&quot".html_safe
 
   = render "events/event_scope", event: event
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index b9e88f3fc47..4c1ee5fd3b7 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -7,9 +7,9 @@
 .event-title.d-flex.flex-wrap
   = inline_event_icon(event)
   - many_refs = event.ref_count.to_i > 1
-  %span.event-type.d-inline-block.append-right-4.pushed= many_refs ? "#{event.action_name} #{event.ref_count} #{event.ref_type.pluralize}" : "#{event.action_name} #{event.ref_type}"
+  %span.event-type.d-inline-block.gl-mr-2.pushed= many_refs ? "#{event.action_name} #{event.ref_count} #{event.ref_type.pluralize}" : "#{event.action_name} #{event.ref_type}"
   - unless many_refs
-    %span.append-right-4
+    %span.gl-mr-2
       - commits_link = project_commits_path(project, event.ref_name)
       - should_link = event.tag? ? project.repository.tag_exists?(event.ref_name) : project.repository.branch_exists?(event.ref_name)
       = link_to_if should_link, event.ref_name, commits_link, class: 'ref-name'
diff --git a/app/views/events/event/_wiki.html.haml b/app/views/events/event/_wiki.html.haml
index 7ca98294521..cbd5ebcae12 100644
--- a/app/views/events/event/_wiki.html.haml
+++ b/app/views/events/event/_wiki.html.haml
@@ -4,7 +4,7 @@
 
 .event-title.d-flex.flex-wrap
   = inline_event_icon(event)
-  %span.event-type.d-inline-block.append-right-4{ class: event.action_name }
+  %span.event-type.d-inline-block.gl-mr-2{ class: event.action_name }
     = event.action_name
   = event_wiki_title_html(event)
   = render "events/event_scope", event: event