Add latest changes from gitlab-org/gitlab@master

9 files changed, 20 insertions, 11 deletions

diff --git a/app/assets/javascripts/admin/users/tabs.js b/app/assets/javascripts/admin/users/tabs.js
index 9ada77396c7..cbaab7df4e9 100644
--- a/app/assets/javascripts/admin/users/tabs.js
+++ b/app/assets/javascripts/admin/users/tabs.js
@@ -1,11 +1,20 @@
+import Api from '~/api';
 import { historyPushState } from '~/lib/utils/common_utils';
 import { mergeUrlParams } from '~/lib/utils/url_utility';
 
 const COHORTS_PANE = 'cohorts';
+const COHORTS_PANE_TAB_CLICK_EVENT = 'i_analytics_cohorts';
 
 const tabClickHandler = (e) => {
   const { hash } = e.currentTarget;
-  const tab = hash === `#${COHORTS_PANE}` ? COHORTS_PANE : null;
+
+  let tab = null;
+
+  if (hash === `#${COHORTS_PANE}`) {
+    tab = COHORTS_PANE;
+    Api.trackRedisHllUserEvent(COHORTS_PANE_TAB_CLICK_EVENT);
+  }
+
   const newUrl = mergeUrlParams({ tab }, window.location.href);
   historyPushState(newUrl);
 };
diff --git a/app/assets/javascripts/notifications/constants.js b/app/assets/javascripts/notifications/constants.js
index 07c569a0293..c12f6a75f96 100644
--- a/app/assets/javascripts/notifications/constants.js
+++ b/app/assets/javascripts/notifications/constants.js
@@ -22,10 +22,10 @@ export const i18n = {
     owner_disabled: __('Notifications have been disabled by the project or group owner'),
   },
   updateNotificationLevelErrorMessage: __(
-    'An error occured while updating the notification settings. Please try again.',
+    'An error occurred while updating the notification settings. Please try again.',
   ),
   loadNotificationLevelErrorMessage: __(
-    'An error occured while loading the notification settings. Please try again.',
+    'An error occurred while loading the notification settings. Please try again.',
   ),
   customNotificationsModal: {
     title: __('Custom notification events'),
diff --git a/app/assets/javascripts/packages/list/constants.js b/app/assets/javascripts/packages/list/constants.js
index d47eb8c3421..25a55200df2 100644
--- a/app/assets/javascripts/packages/list/constants.js
+++ b/app/assets/javascripts/packages/list/constants.js
@@ -71,7 +71,7 @@ export const PACKAGE_TYPES = [
     type: PackageType.MAVEN,
   },
   {
-    title: s__('PackageRegistry|NPM'),
+    title: s__('PackageRegistry|npm'),
     type: PackageType.NPM,
   },
   {
diff --git a/app/assets/javascripts/packages/shared/utils.js b/app/assets/javascripts/packages/shared/utils.js
index 677550f77ec..d34372e89b6 100644
--- a/app/assets/javascripts/packages/shared/utils.js
+++ b/app/assets/javascripts/packages/shared/utils.js
@@ -14,7 +14,7 @@ export const getPackageTypeLabel = (packageType) => {
     case PackageType.MAVEN:
       return s__('PackageType|Maven');
     case PackageType.NPM:
-      return s__('PackageType|NPM');
+      return s__('PackageType|npm');
     case PackageType.NUGET:
       return s__('PackageType|NuGet');
     case PackageType.PYPI:
diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue b/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue
index 9879c98e3b8..0e6d268fc19 100644
--- a/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue
+++ b/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue
@@ -32,7 +32,7 @@ export default {
     };
   },
   errorTexts: {
-    [DRAW_FAILURE]: __('An error ocurred while drawing job relationship links.'),
+    [DRAW_FAILURE]: __('An error occurred while drawing job relationship links.'),
     [LOAD_FAILURE]: __('We are currently unable to fetch data for this pipeline.'),
     [DEFAULT]: __('An unknown error occurred while loading this graph.'),
   },
diff --git a/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue b/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue
index 733f833d51a..09ca1fbe6c6 100644
--- a/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue
+++ b/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue
@@ -252,10 +252,10 @@ export default {
   },
   errorTexts: {
     [LOAD_ANALYTICS_FAILURE]: s__(
-      'PipelineCharts|An error has ocurred when retrieving the analytics data',
+      'PipelineCharts|An error has occurred when retrieving the analytics data',
     ),
     [LOAD_PIPELINES_FAILURE]: s__(
-      'PipelineCharts|An error has ocurred when retrieving the pipelines data',
+      'PipelineCharts|An error has occurred when retrieving the pipelines data',
     ),
     [PARSE_FAILURE]: s__('PipelineCharts|There was an error parsing the data for the charts.'),
     [DEFAULT]: s__('PipelineCharts|An unknown error occurred while processing CI/CD analytics.'),
diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
index 9b3c0dd2755..fb00f58abae 100644
--- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
+++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
@@ -95,7 +95,7 @@ export default {
         })
         .catch((err) => {
           this.showAlert(
-            sprintf(__('An error occured while saving changes: %{error}'), {
+            sprintf(__('An error occurred while saving changes: %{error}'), {
               error: err?.response?.data?.message,
             }),
           );
diff --git a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
index 033b8798473..466fbab6841 100644
--- a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
+++ b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
@@ -86,7 +86,7 @@ export default {
       }
 
       if (!report.name) {
-        return s__('Reports|An error occured while loading report');
+        return s__('Reports|An error occurred while loading report');
       }
 
       return reportTextBuilder(name, summary);
diff --git a/app/assets/javascripts/static_site_editor/constants.js b/app/assets/javascripts/static_site_editor/constants.js
index 4cabd943e22..5fb20b00705 100644
--- a/app/assets/javascripts/static_site_editor/constants.js
+++ b/app/assets/javascripts/static_site_editor/constants.js
@@ -12,7 +12,7 @@ export const SUBMIT_CHANGES_MERGE_REQUEST_ERROR = s__(
   'StaticSiteEditor|Could not create merge request.',
 );
 export const LOAD_CONTENT_ERROR = __(
-  'An error ocurred while loading your content. Please try again.',
+  'An error occurred while loading your content. Please try again.',
 );
 
 export const DEFAULT_FORMATTING_CHANGES_COMMIT_MESSAGE = s__(