diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
| commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
| tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/assets/javascripts/milestones | |
| parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) | |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/milestones')
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/milestones/components/promote_milestone_modal.vue b/app/assets/javascripts/milestones/components/promote_milestone_modal.vue index cac6d722ced..9e537fa2c82 100644 --- a/app/assets/javascripts/milestones/components/promote_milestone_modal.vue +++ b/app/assets/javascripts/milestones/components/promote_milestone_modal.vue @@ -1,6 +1,6 @@ <script> import { GlModal } from '@gitlab/ui'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { visitUrl } from '~/lib/utils/url_utility'; import { __, s__, sprintf } from '~/locale'; @@ -63,7 +63,7 @@ export default { visitUrl(response.data.url); }) .catch((error) => { - createFlash({ + createAlert({ message: error, }); }) diff --git a/app/assets/javascripts/milestones/milestone.js b/app/assets/javascripts/milestones/milestone.js index 8f2721c2a5b..d9e72340d62 100644 --- a/app/assets/javascripts/milestones/milestone.js +++ b/app/assets/javascripts/milestones/milestone.js @@ -1,4 +1,4 @@ -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import { sanitize } from '~/lib/dompurify'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; @@ -34,7 +34,7 @@ export default class Milestone { this.loadedTabs.add(tab); }) .catch(() => - createFlash({ + createAlert({ message: __('Error loading milestone tab'), }), ); diff --git a/app/assets/javascripts/milestones/milestone_select.js b/app/assets/javascripts/milestones/milestone_select.js index c95ec3dd10b..d4876c3dbe8 100644 --- a/app/assets/javascripts/milestones/milestone_select.js +++ b/app/assets/javascripts/milestones/milestone_select.js @@ -121,7 +121,7 @@ export default class MilestoneSelect { title: __('Started'), }); } - if (extraOptions.length) { + if (extraOptions.length && data.length) { extraOptions.push({ type: 'divider' }); } |