summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 09:09:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 09:09:31 +0000
commit04baa85554ff13bdd4d6f4e6bb24119d17608fee (patch)
tree7cb9c0977e09d97da340f48703d79b2dbd3579a0 /app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue
parent42f41de46525ce0065f02ee07c1a79f5669526a0 (diff)
downloadgitlab-ce-04baa85554ff13bdd4d6f4e6bb24119d17608fee.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue')
-rw-r--r--app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue b/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue
index 8a8cf09194c..af438ce5619 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue
@@ -1,9 +1,9 @@
<script>
-import { GlButton, GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui';
+import { GlDeprecatedButton, GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue';
export default {
- components: { Icon, GlButton, GlLoadingIcon },
+ components: { Icon, GlDeprecatedButton, GlLoadingIcon },
directives: { 'gl-tooltip': GlTooltipDirective },
props: {
canApply: {
@@ -52,7 +52,7 @@ export default {
<gl-loading-icon class="d-flex-center mr-2" />
<span>{{ __('Applying suggestion') }}</span>
</div>
- <gl-button
+ <gl-deprecated-button
v-else-if="canApply"
v-gl-tooltip.viewport="__('This also resolves the discussion')"
class="btn-inverted js-apply-btn"
@@ -61,6 +61,6 @@ export default {
@click="applySuggestion"
>
{{ __('Apply suggestion') }}
- </gl-button>
+ </gl-deprecated-button>
</div>
</template>