Merge branch 'show_estimate_on_issues_list' into 'master'

Show estimate on issues list

Closes #17146

See merge request gitlab-org/gitlab!28271

app/assets/stylesheets/pages/issuable.scss

@@ -754,7 +754,8 @@
         margin-right: 10px;
         min-width: 0;
 
-        .issue-weight-icon {
+        .issue-weight-icon,
+        .issue-estimate-icon {
           vertical-align: sub;
         }
       }

app/views/projects/issues/_issue.html.haml

@@ -43,6 +43,7 @@
               = link_to_label(label, small: true)
 
           = render_if_exists "projects/issues/issue_weight", issue: issue
+          = render "projects/issues/issue_estimate", issue: issue
 
       .issuable-meta
         %ul.controls

app/views/projects/issues/_issue_estimate.html.haml

+- issue = local_assigns.fetch(:issue)
+
+- if issue.time_estimate > 0
+  %span.issuable-estimate.d-none.d-sm-inline-block.has-tooltip{ data: { container: 'body', qa_selector: 'issuable_estimate' }, title: _('Estimate') }
+     
+    = sprite_icon('timer', size: 16, css_class: 'issue-estimate-icon')
+    = Gitlab::TimeTrackingFormatter.output(issue.time_estimate)

changelogs/unreleased/show_estimate_on_issues_list.yml

+---
+title: Show estimate on issues list
+merge_request: 28271
+author: Lee Tickett
+type: added

locale/gitlab.pot

@@ -8799,6 +8799,9 @@ msgstr ""
 msgid "Errors:"
 msgstr ""
 
+msgid "Estimate"
+msgstr ""
+
 msgid "Estimated"
 msgstr ""