diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/assets/javascripts/custom_metrics/components | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets/javascripts/custom_metrics/components')
-rw-r--r-- | app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue b/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue index f60be52d6ca..9c28801306c 100644 --- a/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue +++ b/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue @@ -1,5 +1,5 @@ <script> -import { GlDeprecatedButton } from '@gitlab/ui'; +import { GlButton } from '@gitlab/ui'; import { __, s__ } from '~/locale'; import csrf from '~/lib/utils/csrf'; import CustomMetricsFormFields from './custom_metrics_form_fields.vue'; @@ -10,7 +10,7 @@ export default { components: { CustomMetricsFormFields, DeleteCustomMetricModal, - GlDeprecatedButton, + GlButton, }, props: { customMetricsPath: { @@ -76,15 +76,10 @@ export default { @formValidation="formValidation" /> <div class="form-actions"> - <gl-deprecated-button variant="success" :disabled="!formIsValid" @click="submit"> + <gl-button variant="success" category="primary" :disabled="!formIsValid" @click="submit"> {{ saveButtonText }} - </gl-deprecated-button> - <gl-deprecated-button - variant="secondary" - class="float-right" - :href="editProjectServicePath" - >{{ __('Cancel') }}</gl-deprecated-button - > + </gl-button> + <gl-button class="float-right" :href="editProjectServicePath">{{ __('Cancel') }}</gl-button> <delete-custom-metric-modal v-if="metricPersisted" :delete-metric-url="customMetricsPath" |