Commit c3bc44cc authored by Kushal Pandya's avatar Kushal Pandya

Merge branch...

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

Replace <gl-deprecated-button> with <gl-button> in alerts_service_form.vue

Closes #219785

See merge request gitlab-org/gitlab!34293
parents ecf93abc 6d412ace
<script> <script>
import { import {
GlDeprecatedButton, GlButton,
GlFormGroup, GlFormGroup,
GlFormInput, GlFormInput,
GlLink, GlLink,
...@@ -26,7 +26,7 @@ export default { ...@@ -26,7 +26,7 @@ export default {
COPY_TO_CLIPBOARD: __('Copy'), COPY_TO_CLIPBOARD: __('Copy'),
RESET_KEY: __('Reset key'), RESET_KEY: __('Reset key'),
components: { components: {
GlDeprecatedButton, GlButton,
GlFormGroup, GlFormGroup,
GlFormInput, GlFormInput,
GlLink, GlLink,
...@@ -167,9 +167,7 @@ export default { ...@@ -167,9 +167,7 @@ export default {
<clipboard-button :text="authorizationKey" :title="$options.COPY_TO_CLIPBOARD" /> <clipboard-button :text="authorizationKey" :title="$options.COPY_TO_CLIPBOARD" />
</span> </span>
</div> </div>
<gl-deprecated-button v-gl-modal.authKeyModal class="mt-2">{{ <gl-button v-gl-modal.authKeyModal class="mt-2">{{ $options.RESET_KEY }}</gl-button>
$options.RESET_KEY
}}</gl-deprecated-button>
<gl-modal <gl-modal
modal-id="authKeyModal" modal-id="authKeyModal"
:title="$options.RESET_KEY" :title="$options.RESET_KEY"
......
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