diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2019-08-09 09:59:38 +0000 |
---|---|---|
committer | Bob Van Landuyt <bob@gitlab.com> | 2019-08-09 09:59:38 +0000 |
commit | 915bc89396f6c8f7a1a82ffc3fce8ba5c0ac4a5f (patch) | |
tree | 7ea422f275c34758578a4f064c7695216abbb008 /app/assets | |
parent | cd81e4e31cc621bb6376ff8e6e568a4072d8716d (diff) | |
download | gitlab-ce-915bc89396f6c8f7a1a82ffc3fce8ba5c0ac4a5f.tar.gz |
Revert "Merge branch '4221-board-milestone-should-persist-any-none-properly-ce' into 'master'"
This reverts merge request !30613
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/milestone_select.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index 01ed27c49fb..43949d5cc86 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 ? __('Any Milestone') : null; + selectedMilestoneDefault = showAny ? '' : null; selectedMilestoneDefault = showNo && defaultNo ? __('No Milestone') : selectedMilestoneDefault; selectedMilestone = $dropdown.data('selected') || selectedMilestoneDefault; @@ -74,16 +74,14 @@ export default class MilestoneSelect { if (showAny) { extraOptions.push({ id: null, - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings - name: 'Any', + name: null, title: __('Any Milestone'), }); } if (showNo) { extraOptions.push({ id: -1, - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings - name: 'None', + name: __('No Milestone'), title: __('No Milestone'), }); } |