diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue | |
parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
download | gitlab-ce-05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2.tar.gz |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue index 8e1b18c63a4..a5d982fe221 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue @@ -88,25 +88,24 @@ export default { </template> <template v-if="!isLoading && !state.shouldBeRebased" #actions> <gl-button - v-if="userPermissions.canMerge" + v-if="showResolveButton" + :href="mr.conflictResolutionPath" size="small" variant="confirm" - category="secondary" - data-testid="merge-locally-button" - class="js-check-out-modal-trigger gl-align-self-start" - :class="{ 'gl-mr-2': showResolveButton }" + class="gl-align-self-start" + data-testid="resolve-conflicts-button" > - {{ s__('mrWidget|Resolve locally') }} + {{ s__('mrWidget|Resolve conflicts') }} </gl-button> <gl-button - v-if="showResolveButton" - :href="mr.conflictResolutionPath" + v-if="userPermissions.canMerge" size="small" variant="confirm" - class="gl-mb-2 gl-md-mb-0 gl-align-self-start" - data-testid="resolve-conflicts-button" + category="secondary" + data-testid="merge-locally-button" + class="js-check-out-modal-trigger gl-align-self-start" > - {{ s__('mrWidget|Resolve conflicts') }} + {{ s__('mrWidget|Resolve locally') }} </gl-button> </template> </state-container> |