diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-07 06:09:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-07 06:09:43 +0300 |
| commit | cd0a6b898238d02cf862379a6fe06e96a737bbb5 (patch) | |
| tree | ae0bae3dfa97ef58b487b46b835cd90f6dadbb5e /app/assets/javascripts/vue_shared/components/markdown | |
| parent | fa5ca3519ed27787cb302f0c62f791def0834038 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/markdown')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue | 5 |
1 files changed, 2 insertions, 3 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 c236b7ad6b1..f9ae59567b2 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 @@ -139,7 +139,7 @@ export default { <gl-loading-icon size="sm" class="d-flex-center mr-2" /> <span>{{ applyingSuggestionsMessage }}</span> </div> - <div v-else-if="canApply" class="d-flex align-items-center"> + <div v-else-if="isLoggedIn" class="d-flex align-items-center"> <div v-if="isBatched"> <gl-button class="btn-inverted js-remove-from-batch-btn btn-grouped" @@ -149,9 +149,8 @@ export default { {{ __('Remove from batch') }} </gl-button> </div> - <div v-else> + <div v-else-if="!isDisableButton && suggestionsCount > 1"> <gl-button - v-if="!isDisableButton && suggestionsCount > 1" class="btn-inverted js-add-to-batch-btn btn-grouped" data-qa-selector="add_suggestion_batch_button" :disabled="isDisableButton" |