Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-09-07 18:08:44 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-09-07 18:08:44 +0300
commit06c9acad67a086a66f1d63aa1b79fc77a19cc646 (patch)
treeb2c642197d4a9e549417dadfb050d2645ec7ffa7 /app/assets/javascripts/analytics
parent01f48ebf027baee9f845cecbf094e91a98c9a324 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/analytics')
-rw-r--r--app/assets/javascripts/analytics/cycle_analytics/components/formatted_stage_count.vue3
-rw-r--r--app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue3
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/formatted_stage_count.vue b/app/assets/javascripts/analytics/cycle_analytics/components/formatted_stage_count.vue
index b622b0441e2..724e9c91305 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/formatted_stage_count.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/formatted_stage_count.vue
@@ -13,7 +13,8 @@ export default {
formattedStageCount() {
if (!this.stageCount) {
return '-';
- } else if (this.stageCount > 1000) {
+ }
+ if (this.stageCount > 1000) {
return sprintf(s__('ValueStreamAnalytics|%{stageCount}+ items'), {
stageCount: formatNumber(1000),
});
diff --git a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
index f881c924ae5..ddfc6baafa9 100644
--- a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
+++ b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
@@ -69,7 +69,8 @@ export default {
selectedProjectsLabel() {
if (this.selectedProjects.length === 1) {
return this.selectedProjects[0].name;
- } else if (this.selectedProjects.length > 1) {
+ }
+ if (this.selectedProjects.length > 1) {
return n__(
'CycleAnalytics|Project selected',
'CycleAnalytics|%d projects selected',