diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/assets/javascripts/pipeline_new | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/assets/javascripts/pipeline_new')
-rw-r--r-- | app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue | 11 |
1 files changed, 10 insertions, 1 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 20067f6646f..6552665100a 100644 --- a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue +++ b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue @@ -14,6 +14,7 @@ import { GlDropdownItem, GlSearchBoxByType, GlSprintf, + GlLoadingIcon, } from '@gitlab/ui'; import { s__, __, n__ } from '~/locale'; import axios from '~/lib/utils/axios_utils'; @@ -45,6 +46,7 @@ export default { GlDropdownItem, GlSearchBoxByType, GlSprintf, + GlLoadingIcon, }, props: { pipelinesPath: { @@ -96,6 +98,7 @@ export default { warnings: [], totalWarnings: 0, isWarningDismissed: false, + isLoading: false, }; }, computed: { @@ -209,6 +212,8 @@ export default { fetchConfigVariables(refValue) { if (gon?.features?.newPipelineFormPrefilledVars) { + this.isLoading = true; + return axios .get(this.configVariablesPath, { params: { @@ -226,6 +231,8 @@ export default { } }); + this.isLoading = false; + return { params, descriptions }; }); } @@ -324,7 +331,9 @@ export default { > </gl-form-group> - <gl-form-group :label="s__('Pipeline|Variables')"> + <gl-loading-icon v-if="isLoading" class="gl-mb-5" size="lg" /> + + <gl-form-group v-else :label="s__('Pipeline|Variables')"> <div v-for="(variable, index) in variables" :key="variable.uniqueId" |