diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 12:09:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 12:09:31 +0300 |
commit | 04baa85554ff13bdd4d6f4e6bb24119d17608fee (patch) | |
tree | 7cb9c0977e09d97da340f48703d79b2dbd3579a0 /app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue | |
parent | 42f41de46525ce0065f02ee07c1a79f5669526a0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue')
-rw-r--r-- | app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue b/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue index 0460181558b..32fe841f16e 100644 --- a/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue +++ b/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue @@ -4,7 +4,7 @@ import { mapActions, mapState } from 'vuex'; import { ADD_CI_VARIABLE_MODAL_ID } from '../constants'; import CiEnvironmentsDropdown from './ci_environments_dropdown.vue'; import { - GlButton, + GlDeprecatedButton, GlModal, GlFormSelect, GlFormGroup, @@ -19,7 +19,7 @@ export default { modalId: ADD_CI_VARIABLE_MODAL_ID, components: { CiEnvironmentsDropdown, - GlButton, + GlDeprecatedButton, GlModal, GlFormSelect, GlFormGroup, @@ -212,22 +212,22 @@ export default { </gl-form-group> </form> <template #modal-footer> - <gl-button @click="hideModal">{{ __('Cancel') }}</gl-button> - <gl-button + <gl-deprecated-button @click="hideModal">{{ __('Cancel') }}</gl-deprecated-button> + <gl-deprecated-button v-if="variableBeingEdited" ref="deleteCiVariable" category="secondary" variant="danger" @click="deleteVarAndClose" - >{{ __('Delete variable') }}</gl-button + >{{ __('Delete variable') }}</gl-deprecated-button > - <gl-button + <gl-deprecated-button ref="updateOrAddVariable" :disabled="!canSubmit" variant="success" @click="updateOrAddVariable" >{{ modalActionText }} - </gl-button> + </gl-deprecated-button> </template> </gl-modal> </template> |