Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 3 insertions, 5 deletions

diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index e9a0fef06c4..e9dc271dbdd 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -110,10 +110,8 @@ module TodosHelper
         'alert'
       end
 
-    content_tag(:span, nil, class: 'target-status') do
-      content_tag(:span, nil, class: "status-box status-box-#{type}-#{todo.target.state.to_s.dasherize}") do
-        todo.target.state.to_s.capitalize
-      end
+    tag.span class: "gl-my-0 gl-px-2 status-box status-box-#{type}-#{todo.target.state.to_s.dasherize}" do
+      todo.target.state.to_s.capitalize
     end
   end
 
@@ -232,4 +230,4 @@ module TodosHelper
   end
 end
 
-TodosHelper.prepend_if_ee('EE::TodosHelper')
+TodosHelper.prepend_mod_with('TodosHelper')