Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 4 deletions

diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 547977c01a9..15842dec3dd 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -164,6 +164,12 @@ module IssuablesHelper
     h(title || default_label)
   end
 
+  def issuable_meta_author_status(author)
+    return "" unless show_status_emoji?(author&.status) && status = user_status(author)
+
+    "#{status}".html_safe
+  end
+
   def issuable_meta(issuable, project)
     output = []
     output << "Opened #{time_ago_with_tooltip(issuable.created_at)} by ".html_safe
@@ -177,10 +183,7 @@ module IssuablesHelper
       author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "d-inline d-sm-none")
 
       author_output << issuable_meta_author_slot(issuable.author, css_class: 'ml-1')
-
-      if status = user_status(issuable.author)
-        author_output << "#{status}".html_safe
-      end
+      author_output << issuable_meta_author_status(issuable.author)
 
       author_output
     end