Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-18 03:10:36 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-18 03:10:36 +0300
commitd8b613250b5dcbf371d81a99bdebf559bb89abb6 (patch)
tree8245e9045b1c433b93b651e0c3982cbdfc67111b /app/assets/javascripts/batch_comments
parent9facfe5cb194005894467c06e4ea1a9800034ab4 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/batch_comments')
-rw-r--r--app/assets/javascripts/batch_comments/components/review_bar.vue12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/batch_comments/components/review_bar.vue b/app/assets/javascripts/batch_comments/components/review_bar.vue
index b0e8b806701..2d7b86d2431 100644
--- a/app/assets/javascripts/batch_comments/components/review_bar.vue
+++ b/app/assets/javascripts/batch_comments/components/review_bar.vue
@@ -1,13 +1,12 @@
<script>
import { mapActions, mapState, mapGetters } from 'vuex';
-import { GlModal, GlModalDirective } from '@gitlab/ui';
+import { GlModal, GlModalDirective, GlButton } from '@gitlab/ui';
import { sprintf, s__ } from '~/locale';
-import LoadingButton from '~/vue_shared/components/loading_button.vue';
import PreviewDropdown from './preview_dropdown.vue';
export default {
components: {
- LoadingButton,
+ GlButton,
GlModal,
PreviewDropdown,
},
@@ -48,12 +47,13 @@ export default {
<nav class="review-bar-component">
<div class="review-bar-content qa-review-bar">
<preview-dropdown />
- <loading-button
+ <gl-button
v-gl-modal="$options.modalId"
:loading="isDiscarding"
- :label="__('Discard review')"
class="qa-discard-review float-right"
- />
+ >
+ {{ __('Discard review') }}
+ </gl-button>
</div>
</nav>
<gl-modal