diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/packages_and_registries/settings/project | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/packages_and_registries/settings/project')
-rw-r--r-- | app/assets/javascripts/packages_and_registries/settings/project/components/settings_form.vue | 8 | ||||
-rw-r--r-- | app/assets/javascripts/packages_and_registries/settings/project/utils.js | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/app/assets/javascripts/packages_and_registries/settings/project/components/settings_form.vue b/app/assets/javascripts/packages_and_registries/settings/project/components/settings_form.vue index 41be70a3ad5..6030af9d2c3 100644 --- a/app/assets/javascripts/packages_and_registries/settings/project/components/settings_form.vue +++ b/app/assets/javascripts/packages_and_registries/settings/project/components/settings_form.vue @@ -88,8 +88,6 @@ export default { return { ...this.value, cadence: this.findDefaultOption('cadence'), - keepN: this.findDefaultOption('keepN'), - olderThan: this.findDefaultOption('olderThan'), }; }, showLoadingIcon() { @@ -158,14 +156,14 @@ export default { .then(({ data }) => { const errorMessage = data?.updateContainerExpirationPolicy?.errors[0]; if (errorMessage) { - this.$toast.show(errorMessage, { type: 'error' }); + this.$toast.show(errorMessage); } else { - this.$toast.show(UPDATE_SETTINGS_SUCCESS_MESSAGE, { type: 'success' }); + this.$toast.show(UPDATE_SETTINGS_SUCCESS_MESSAGE); } }) .catch((error) => { this.setApiErrors(error); - this.$toast.show(UPDATE_SETTINGS_ERROR_MESSAGE, { type: 'error' }); + this.$toast.show(UPDATE_SETTINGS_ERROR_MESSAGE); }) .finally(() => { this.mutationLoading = false; diff --git a/app/assets/javascripts/packages_and_registries/settings/project/utils.js b/app/assets/javascripts/packages_and_registries/settings/project/utils.js index 4a2d7c7d466..b577a051862 100644 --- a/app/assets/javascripts/packages_and_registries/settings/project/utils.js +++ b/app/assets/javascripts/packages_and_registries/settings/project/utils.js @@ -11,11 +11,14 @@ export const olderThanTranslationGenerator = (variable) => n__('%d day', '%d day export const keepNTranslationGenerator = (variable) => n__('%d tag per image name', '%d tags per image name', variable); -export const optionLabelGenerator = (collection, translationFn) => - collection.map((option) => ({ +export const optionLabelGenerator = (collection, translationFn) => { + const result = collection.map((option) => ({ ...option, label: translationFn(option.variable), })); + result.unshift({ key: null, label: '' }); + return result; +}; export const formOptionsGenerator = () => { return { |