diff options
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue index 0e714cc2aa1..adfbcd18588 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue @@ -1,5 +1,5 @@ <script> -import { GlLoadingIcon } from '@gitlab-org/gitlab-ui'; +import { GlLoadingIcon } from '@gitlab/ui'; import simplePoll from '../../../lib/utils/simple_poll'; import eventHub from '../../event_hub'; import statusIcon from '../mr_widget_status_icon.vue'; @@ -87,23 +87,17 @@ export default { </script> <template> <div class="mr-widget-body media"> - <status-icon - :status="status" - :show-disabled-button="showDisabledButton" - /> + <status-icon :status="status" :show-disabled-button="showDisabledButton" /> <div class="rebase-state-find-class-convention media media-body space-children"> <template v-if="mr.rebaseInProgress || isMakingRequest"> - <span class="bold"> - Rebase in progress - </span> + <span class="bold"> Rebase in progress </span> </template> <template v-if="!mr.rebaseInProgress && !mr.canPushToSourceBranch"> <span class="bold"> - Fast-forward merge is not possible. - Rebase the source branch onto - <span class="label-branch">{{ mr.targetBranch }}</span> - to allow this merge request to be merged. + Fast-forward merge is not possible. Rebase the source branch onto + <span class="label-branch">{{ mr.targetBranch }}</span> to allow this merge request to be + merged. </span> </template> <template v-if="!mr.rebaseInProgress && mr.canPushToSourceBranch && !isMakingRequest"> @@ -120,19 +114,11 @@ js-toggle-container accept-action media space-children" <gl-loading-icon v-if="isMakingRequest" /> Rebase </button> - <span - v-if="!rebasingError" - class="bold" - > - Fast-forward merge is not possible. - Rebase the source branch onto the target branch or merge target - branch into source branch to allow this merge request to be merged. - </span> - <span - v-else - class="bold danger"> - {{ rebasingError }} + <span v-if="!rebasingError" class="bold"> + Fast-forward merge is not possible. Rebase the source branch onto the target branch or + merge target branch into source branch to allow this merge request to be merged. </span> + <span v-else class="bold danger"> {{ rebasingError }} </span> </div> </template> </div> |