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:
authorcharlie ablett <cablett@gitlab.com>2019-07-31 16:51:46 +0300
committerPaul Slaughter <pslaughter@gitlab.com>2019-07-31 16:51:46 +0300
commit5d7b46d523bb2310ac33d5b4c06137e9a3fd17aa (patch)
tree7a0ffa08b63f6431e3f29691ae681bd12b97b59e /app/assets/javascripts/milestone_select.js
parentbea3d730c2257d5c5e4f2539f4e4b1b81be84250 (diff)
Port CE changes from EE
- DB migration of board milestone values - issue finder & spec updates
Diffstat (limited to 'app/assets/javascripts/milestone_select.js')
-rw-r--r--app/assets/javascripts/milestone_select.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js
index 43949d5cc86..01ed27c49fb 100644
--- a/app/assets/javascripts/milestone_select.js
+++ b/app/assets/javascripts/milestone_select.js
@@ -55,7 +55,7 @@ export default class MilestoneSelect {
const $sidebarCollapsedValue = $block.find('.sidebar-collapsed-icon');
const $value = $block.find('.value');
const $loading = $block.find('.block-loading').fadeOut();
- selectedMilestoneDefault = showAny ? '' : null;
+ selectedMilestoneDefault = showAny ? __('Any Milestone') : null;
selectedMilestoneDefault =
showNo && defaultNo ? __('No Milestone') : selectedMilestoneDefault;
selectedMilestone = $dropdown.data('selected') || selectedMilestoneDefault;
@@ -74,14 +74,16 @@ export default class MilestoneSelect {
if (showAny) {
extraOptions.push({
id: null,
- name: null,
+ // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+ name: 'Any',
title: __('Any Milestone'),
});
}
if (showNo) {
extraOptions.push({
id: -1,
- name: __('No Milestone'),
+ // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+ name: 'None',
title: __('No Milestone'),
});
}