diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 12:08:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 12:08:53 +0300 |
commit | 764ff99273496e7d1da0dc9cc2255445cf7dc540 (patch) | |
tree | eb359257b9eb9b1ab2ad3b75dd3f04b717889410 /app/assets/javascripts/pipeline_new | |
parent | fdc5404bc3391e9a767b2a32422c082b9490c663 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipeline_new')
-rw-r--r-- | app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue index 5472e51445a..d74b6e8edf6 100644 --- a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue +++ b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue @@ -123,6 +123,7 @@ export default { isWarningDismissed: false, isLoading: false, submitted: false, + ccAlertDismissed: false, }; }, computed: { @@ -151,7 +152,7 @@ export default { return this.form[this.refFullName]?.descriptions ?? {}; }, ccRequiredError() { - return this.error === CC_VALIDATION_REQUIRED_ERROR; + return this.error === CC_VALIDATION_REQUIRED_ERROR && !this.ccAlertDismissed; }, }, watch: { @@ -292,6 +293,7 @@ export default { }, createPipeline() { this.submitted = true; + this.ccAlertDismissed = false; return axios .post(this.pipelinesPath, { @@ -333,13 +335,17 @@ export default { this.warnings = warnings; this.totalWarnings = totalWarnings; }, + dismissError() { + this.ccAlertDismissed = true; + this.error = null; + }, }, }; </script> <template> <gl-form @submit.prevent="createPipeline"> - <cc-validation-required-alert v-if="ccRequiredError" class="gl-pb-5" /> + <cc-validation-required-alert v-if="ccRequiredError" class="gl-pb-5" @dismiss="dismissError" /> <gl-alert v-else-if="error" :title="errorTitle" |