diff options
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 | 57 |
1 files changed, 11 insertions, 46 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 23f415c3116..ee90d734ecb 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 @@ -1,6 +1,5 @@ <script> -import { GlButton, GlModalDirective, GlSkeletonLoader, GlPopover, GlLink } from '@gitlab/ui'; -import { s__ } from '~/locale'; +import { GlButton, GlModalDirective, GlSkeletonLoader } from '@gitlab/ui'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import mergeRequestQueryVariablesMixin from '../../mixins/merge_request_query_variables'; import userPermissionsQuery from '../../queries/permissions.query.graphql'; @@ -13,8 +12,6 @@ export default { GlSkeletonLoader, StatusIcon, GlButton, - GlPopover, - GlLink, }, directives: { GlModalDirective, @@ -93,24 +90,12 @@ export default { return this.mr.sourceBranchProtected; }, - popoverTitle() { - return s__( - 'mrWidget|This feature merges changes from the target branch to the source branch. You cannot use this feature since the source branch is protected.', - ); - }, showResolveButton() { - return this.mr.conflictResolutionPath && this.canPushToSourceBranch; - }, - showPopover() { - return this.showResolveButton && this.sourceBranchProtected; + return ( + this.mr.conflictResolutionPath && this.canPushToSourceBranch && !this.sourceBranchProtected + ); }, }, - i18n: { - title: s__( - 'mrWidget|This feature merges changes from the target branch to the source branch. You cannot use this feature since the source branch is protected.', - ), - linkText: s__('mrWidget|Learn more about resolving conflicts'), - }, }; </script> <template> @@ -141,33 +126,13 @@ export default { }} </span> </span> - <span v-if="showResolveButton" ref="popover"> - <gl-button - :href="mr.conflictResolutionPath" - :disabled="sourceBranchProtected" - data-testid="resolve-conflicts-button" - > - {{ s__('mrWidget|Resolve conflicts') }} - </gl-button> - <gl-popover - v-if="showPopover" - :target="() => $refs.popover" - placement="top" - triggers="hover focus" - > - <template #title> - <div class="gl-font-weight-normal gl-font-base"> - {{ $options.i18n.title }} - </div> - </template> - - <div class="gl-text-center"> - <gl-link :href="mr.conflictsDocsPath" target="_blank" rel="noopener noreferrer"> - {{ $options.i18n.linkText }} - </gl-link> - </div> - </gl-popover> - </span> + <gl-button + v-if="showResolveButton" + :href="mr.conflictResolutionPath" + data-testid="resolve-conflicts-button" + > + {{ s__('mrWidget|Resolve conflicts') }} + </gl-button> <gl-button v-if="canMerge" v-gl-modal-directive="'modal-merge-info'" |