Merge branch 'issue_341248_show.html.haml' into 'master'

Fix usage of distance_of_time_in_words_to_now

See merge request !81178

app/views/admin/system_info/show.html.haml

@@ -29,9 +29,9 @@
       %h4.page-title.d-flex
         .gl-display-flex.gl-align-items-center.gl-justify-content-center
           = sprite_icon('clock', size: 18, css_class: 'pod-icon gl-mr-3')
-        = _('Uptime')
+        = _('System started')
       .data
-        %h2= distance_of_time_in_words_to_now(Rails.application.config.booted_at)
+        %h2= time_ago_with_tooltip(Rails.application.config.booted_at)
   .col-sm
     .bg-light.info-well.p-3
       %h4.page-title.d-flex

locale/gitlab.pot

@@ -37922,6 +37922,9 @@ msgstr ""
 msgid "System output"
 msgstr ""
+msgid "System started"
+msgstr ""
+
 msgid "Table of Contents"
 msgstr ""
@@ -41511,9 +41514,6 @@ msgstr ""
 msgid "Upstream"
 msgstr ""
-msgid "Uptime"
-msgstr ""
-
 msgid "Upvotes"
 msgstr ""

spec/features/admin/admin_system_info_spec.rb

@@ -24,7 +24,7 @@
         expect(page).to have_content 'CPU 2 cores'
         expect(page).to have_content 'Memory Usage 4 GB / 16 GB'
         expect(page).to have_content 'Disk Usage'
-        expect(page).to have_content 'Uptime'
+        expect(page).to have_content 'System started'
       end
     end
 
@@ -39,7 +39,7 @@
         expect(page).to have_content 'CPU Unable to collect CPU info'
         expect(page).to have_content 'Memory Usage 4 GB / 16 GB'
         expect(page).to have_content 'Disk Usage'
-        expect(page).to have_content 'Uptime'
+        expect(page).to have_content 'System started'
       end
     end
 
@@ -54,7 +54,7 @@
         expect(page).to have_content 'CPU 2 cores'
         expect(page).to have_content 'Memory Usage Unable to collect memory info'
         expect(page).to have_content 'Disk Usage'
-        expect(page).to have_content 'Uptime'
+        expect(page).to have_content 'System started'
       end
     end
   end