From e157db12b0dae748321400e664ec62df384c0f8c Mon Sep 17 00:00:00 2001
From: Taras Tadai <ttaday@softserveinc.com>
Date: Tue, 13 Feb 2024 01:12:16 +0000
Subject: [PATCH] Removed deprecated bs-callout markup in cohorts table
---
app/views/admin/cohorts/_cohorts_table.html.haml | 9 +++------
locale/gitlab.pot | 6 +++---
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/app/views/admin/cohorts/_cohorts_table.html.haml b/app/views/admin/cohorts/_cohorts_table.html.haml
index c39e8fb00577e..ef24bd9e2e813 100644
--- a/app/views/admin/cohorts/_cohorts_table.html.haml
+++ b/app/views/admin/cohorts/_cohorts_table.html.haml
@@ -1,14 +1,11 @@
- number_of_data_columns = @cohorts[:months_included] - 1
-.bs-callout.clearfix
- %p
- = s_("Cohorts|User cohorts are shown for the last %{months_included} months. Only users with activity are counted in the 'New users' column; inactive users are counted separately.") % { months_included: @cohorts[:months_included] }
- = link_to sprite_icon('question-o'), help_page_path('administration/user_cohorts', anchor: 'cohorts'), title: 'About this feature', target: '_blank', rel: 'noopener noreferrer'
-.table-holder.d-xl-table
+.table-holder.d-xl-table.gl-mt-5
%table.table
%thead
%tr
%th.border-right.pt-4{ colspan: 3 }
+ = s_("Cohorts|New users")
%th.font-weight-bold.pt-4{ colspan: number_of_data_columns }
= s_("Cohorts|Returning users")
%tr
@@ -17,7 +14,7 @@
%th.border-top-0
= s_("Cohorts|Inactive users")
%th.border-top-0.border-right
- = s_("Cohorts|New users")
+ = s_("Cohorts|Active users")
- number_of_data_columns.times do |i|
%th.border-top-0
= s_("Cohorts|Month %{month_index}") % { month_index: i + 1 }
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 9a17bfbc19987..ed55f0dc81245 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -12219,6 +12219,9 @@ msgstr ""
msgid "CodeownersValidation|Zero owners"
msgstr ""
+msgid "Cohorts|Active users"
+msgstr ""
+
msgid "Cohorts|Inactive users"
msgstr ""
@@ -12234,9 +12237,6 @@ msgstr ""
msgid "Cohorts|Returning users"
msgstr ""
-msgid "Cohorts|User cohorts are shown for the last %{months_included} months. Only users with activity are counted in the 'New users' column; inactive users are counted separately."
-msgstr ""
-
msgid "Collapse"
msgstr ""
--
GitLab