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

1 files changed, 6 insertions, 22 deletions

diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 7e0cc591308..1ce99652463 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -196,7 +196,7 @@ module IssuablesHelper
       author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "d-none d-sm-inline")
       author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "d-inline d-sm-none")
 
-      author_output << gitlab_team_member_badge(issuable.author, css_class: 'ml-1')
+      author_output << issuable_meta_author_slot(issuable.author, css_class: 'ml-1')
 
       if status = user_status(issuable.author)
         author_output << "#{status}".html_safe
@@ -213,6 +213,11 @@ module IssuablesHelper
     output.join.html_safe
   end
 
+  # This is a dummy method, and has an override defined in ee
+  def issuable_meta_author_slot(author, css_class: nil)
+    nil
+  end
+
   def issuable_labels_tooltip(labels, limit: 5)
     first, last = labels.partition.with_index { |_, i| i < limit }
 
@@ -242,27 +247,6 @@ module IssuablesHelper
     html.html_safe
   end
 
-  def gitlab_team_member_badge(author, css_class: nil)
-    return unless author.gitlab_employee?
-
-    default_css_class = 'd-inline-block align-middle'
-    gitlab_team_member = _('GitLab Team Member')
-
-    content_tag(
-      :span,
-      class: css_class ? "#{default_css_class} #{css_class}" : default_css_class,
-      data: { toggle: 'tooltip', title: gitlab_team_member, container: 'body' },
-      role: 'img',
-      aria: { label: gitlab_team_member }
-    ) do
-      sprite_icon(
-        'tanuki-verified',
-        size: 16,
-        css_class: 'gl-text-purple d-block'
-      )
-    end
-  end
-
   def issuable_first_contribution_icon
     content_tag(:span, class: 'fa-stack') do
       concat(icon('certificate', class: "fa-stack-2x"))