Commit 004c51b7 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch...

Merge branch '219758-replace-gl-deprecated-button-with-gl-button-in-app-assets-javascripts-custom_metrics' into 'master'

Resolve "Migrate custom metric form buttons"

Closes #219758

See merge request gitlab-org/gitlab!38896
parents 3f6b3993 1ee37122
<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"
......
---
title: Migrate custom metric form buttons
merge_request: 38896
author: George Tsiolis
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment