diff options
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components')
31 files changed, 187 insertions, 422 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue index fe741dc60cb..1c5b5d02e20 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue @@ -116,9 +116,7 @@ export default { <div class="deploy-body"> <div class="js-deployment-info deployment-info"> <template v-if="hasDeploymentMeta"> - <span> - {{ deployedText }} - </span> + <span> {{ deployedText }} </span> <tooltip-on-truncate :title="deployment.name" truncate-target="child" @@ -157,20 +155,14 @@ export default { :main-action-link="deployment.external_url" filter-key="path" > - <template - slot="mainAction" - slot-scope="slotProps" - > + <template slot="mainAction" slot-scope="slotProps"> <review-app-link :link="deployment.external_url" :css-class="`deploy-link js-deploy-url inline ${slotProps.className}`" /> </template> - <template - slot="result" - slot-scope="slotProps" - > + <template slot="result" slot-scope="slotProps"> <a :href="slotProps.result.external_url" target="_blank" @@ -193,11 +185,11 @@ export default { css-class="js-deploy-url js-deploy-url-feature-flag deploy-link btn btn-default btn-sm inlin" /> </template> - <span + <span v-if="deployment.stop_url" - v-tooltip + v-tooltip :title="deployInProgressTooltip" - class="d-inline-block" + class="d-inline-block" tabindex="0" > <loading-button diff --git a/app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue b/app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue index 41dbc5c9cbb..7ce454b7338 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue @@ -154,27 +154,19 @@ export default { <template> <div class="mr-info-list clearfix mr-memory-usage js-mr-memory-usage"> - <p - v-if="shouldShowLoading" - class="usage-info js-usage-info usage-info-loading"> - <i - class="fa fa-spinner fa-spin usage-info-load-spinner" - aria-hidden="true"> - </i>{{ s__('mrWidget|Loading deployment statistics') }} + <p v-if="shouldShowLoading" class="usage-info js-usage-info usage-info-loading"> + <i class="fa fa-spinner fa-spin usage-info-load-spinner" aria-hidden="true"> </i + >{{ s__('mrWidget|Loading deployment statistics') }} </p> <p v-if="shouldShowMemoryGraph" class="usage-info js-usage-info" - v-html="memoryChangeMessage"> - </p> - <p - v-if="shouldShowLoadFailure" - class="usage-info js-usage-info usage-info-failed"> + v-html="memoryChangeMessage" + ></p> + <p v-if="shouldShowLoadFailure" class="usage-info js-usage-info usage-info-failed"> {{ s__('mrWidget|Failed to load deployment statistics') }} </p> - <p - v-if="shouldShowMetricsUnavailable" - class="usage-info js-usage-info usage-info-unavailable"> + <p v-if="shouldShowMetricsUnavailable" class="usage-info js-usage-info usage-info-unavailable"> {{ s__('mrWidget|Deployment statistics are not available currently') }} </p> <memory-graph diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author.vue index 2ad9e8be655..84937aa9510 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author.vue @@ -39,15 +39,7 @@ export default { :title="author.name" class="author-link inline" > - <img - :src="avatarUrl" - class="avatar avatar-inline s16" - /> - <span - v-if="showAuthorName" - class="author" - > - {{ author.name }} - </span> + <img :src="avatarUrl" class="avatar avatar-inline s16" /> + <span v-if="showAuthorName" class="author"> {{ author.name }} </span> </a> </template> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue index 1d902131f49..6b3007fce51 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue @@ -34,12 +34,6 @@ export default { <h4 class="js-mr-widget-author"> {{ actionText }} <mr-widget-author :author="author" /> - <time - v-tooltip - :title="dateTitle" - data-container="body" - > - {{ dateReadable }} - </time> + <time v-tooltip :title="dateTitle" data-container="body"> {{ dateReadable }} </time> </h4> </template> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue index acfdab3a015..6f422ea3f27 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue @@ -76,13 +76,11 @@ export default { </script> <template> <div class="mr-source-target append-bottom-default"> - <div class="git-merge-icon-container append-right-default"> - <icon name="git-merge" /> - </div> + <div class="git-merge-icon-container append-right-default"><icon name="git-merge" /></div> <div class="git-merge-container d-flex"> <div class="normal"> <strong> - {{ s__("mrWidget|Request to merge") }} + {{ s__('mrWidget|Request to merge') }} <tooltip-on-truncate :title="mr.sourceBranch" truncate-target="child" @@ -93,32 +91,23 @@ export default { :title="__('Copy branch name to clipboard')" css-class="btn-default btn-transparent btn-clipboard" /> - {{ s__("mrWidget|into") }} + {{ s__('mrWidget|into') }} <tooltip-on-truncate :title="mr.targetBranch" truncate-target="child" class="label-branch label-truncate" > - <a - :href="mr.targetBranchTreePath" - class="js-target-branch" - > - {{ mr.targetBranch }} - </a> + <a :href="mr.targetBranchTreePath" class="js-target-branch"> {{ mr.targetBranch }} </a> </tooltip-on-truncate> </strong> <div v-if="shouldShowCommitsBehindText" class="diverged-commits-count" v-html="commitsBehindText" - > - </div> + ></div> </div> - <div - v-if="mr.isOpen" - class="branch-actions d-flex" - > + <div v-if="mr.isOpen" class="branch-actions d-flex"> <a v-if="!mr.sourceBranchRemoved" v-tooltip @@ -130,7 +119,7 @@ export default { tabindex="0" role="button" > - {{ s__("mrWidget|Open in Web IDE") }} + {{ s__('mrWidget|Open in Web IDE') }} </a> <button :disabled="mr.sourceBranchRemoved" @@ -139,7 +128,7 @@ export default { class="btn btn-default js-check-out-branch append-right-default" type="button" > - {{ s__("mrWidget|Check out branch") }} + {{ s__('mrWidget|Check out branch') }} </button> <span class="dropdown"> <button @@ -150,29 +139,17 @@ export default { aria-haspopup="true" aria-expanded="false" > - <icon name="download" /> - <i - class="fa fa-caret-down" - aria-hidden="true"> - </i> + <icon name="download" /> <i class="fa fa-caret-down" aria-hidden="true"> </i> </button> <ul class="dropdown-menu dropdown-menu-right"> <li> - <a - :href="mr.emailPatchesPath" - class="js-download-email-patches" - download - > - {{ s__("mrWidget|Email patches") }} + <a :href="mr.emailPatchesPath" class="js-download-email-patches" download> + {{ s__('mrWidget|Email patches') }} </a> </li> <li> - <a - :href="mr.plainDiffPath" - class="js-download-plain-diff" - download - > - {{ s__("mrWidget|Plain diff") }} + <a :href="mr.plainDiffPath" class="js-download-plain-diff" download> + {{ s__('mrWidget|Plain diff') }} </a> </li> </ul> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.vue index 37c6af13c03..a347269c916 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.vue @@ -28,7 +28,7 @@ export default { {{ missingBranchInfo }} </template> <template v-else> - {{ s__("mrWidget|You can merge this merge request manually using the") }} + {{ s__('mrWidget|You can merge this merge request manually using the') }} </template> <button @@ -37,7 +37,7 @@ export default { data-toggle="modal" data-target="#modal_merge_info" > - {{ s__("mrWidget|command line") }} + {{ s__('mrWidget|command line') }} </button> </section> </template> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue index 53608838f2f..71571ba9cab 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue @@ -79,48 +79,29 @@ export default { </script> <template> - <div - v-if="hasPipeline || hasCIError" - class="mr-widget-heading append-bottom-default" - > + <div v-if="hasPipeline || hasCIError" class="mr-widget-heading append-bottom-default"> <div class="ci-widget media"> <template v-if="hasCIError"> <div class="add-border ci-status-icon ci-status-icon-failed ci-error js-ci-error append-right-default" > - <icon - :size="32" - name="status_failed_borderless" - /> - </div> - <div - class="media-body" - v-html="errorText" - > + <icon :size="32" name="status_failed_borderless" /> </div> + <div class="media-body" v-html="errorText"></div> </template> <template v-else-if="hasPipeline"> - <a - :href="status.details_path" - class="align-self-start append-right-default" - > - <ci-icon - :status="status" - :size="32" - :borderless="true" - class="add-border" - /> + <a :href="status.details_path" class="align-self-start append-right-default"> + <ci-icon :status="status" :size="32" :borderless="true" class="add-border" /> </a> <div class="ci-widget-container d-flex"> <div class="ci-widget-content"> <div class="media-body"> <div class="font-weight-bold"> Pipeline - <a - :href="pipeline.path" - class="pipeline-id font-weight-normal pipeline-number" - >#{{ pipeline.id }}</a> + <a :href="pipeline.path" class="pipeline-id font-weight-normal pipeline-number" + >#{{ pipeline.id }}</a + > {{ pipeline.details.status.label }} @@ -130,7 +111,8 @@ export default { :href="pipeline.commit.commit_path" class="commit-sha js-commit-link font-weight-normal" > - {{ pipeline.commit.short_id }}</a> + {{ pipeline.commit.short_id }}</a + > on <tooltip-on-truncate :title="sourceBranch" @@ -140,20 +122,12 @@ export default { /> </template> </div> - <div - v-if="pipeline.coverage" - class="coverage" - > - Coverage {{ pipeline.coverage }}% - </div> + <div v-if="pipeline.coverage" class="coverage">Coverage {{ pipeline.coverage }}%</div> </div> </div> <div> <span class="mr-widget-pipeline-graph"> - <span - v-if="hasStages" - class="stage-cell" - > + <span v-if="hasStages" class="stage-cell"> <div v-for="(stage, i) in pipeline.details.stages" :key="i" diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue index cc77b96a589..1b3b589c32f 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue @@ -30,14 +30,10 @@ export default { </script> <template> <section class="mr-info-list mr-links"> - <p v-if="relatedLinks.closing"> - {{ closesText }} <span v-html="relatedLinks.closing"></span> - </p> + <p v-if="relatedLinks.closing">{{ closesText }} <span v-html="relatedLinks.closing"></span></p> <p v-if="relatedLinks.mentioned"> - {{ s__("mrWidget|Mentions") }} <span v-html="relatedLinks.mentioned"></span> - </p> - <p v-if="relatedLinks.assignToMe"> - <span v-html="relatedLinks.assignToMe"></span> + {{ s__('mrWidget|Mentions') }} <span v-html="relatedLinks.mentioned"></span> </p> + <p v-if="relatedLinks.assignToMe"><span v-html="relatedLinks.assignToMe"></span></p> </section> </template> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue index 060361a6516..780ced4d382 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue @@ -33,18 +33,9 @@ export default { </script> <template> <div class="space-children d-flex append-right-10 widget-status-icon"> - <div - v-if="isLoading" - class="mr-widget-icon" - > - <gl-loading-icon /> - </div> + <div v-if="isLoading" class="mr-widget-icon"><gl-loading-icon /></div> - <ci-icon - v-else - :status="statusObj" - :size="24" - /> + <ci-icon v-else :status="statusObj" :size="24" /> <button v-if="showDisabledButton" @@ -52,7 +43,7 @@ export default { class="js-disabled-merge-button btn btn-success btn-sm" disabled="true" > - {{ s__("mrWidget|Merge") }} + {{ s__('mrWidget|Merge') }} </button> </div> </template> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue b/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue index b007d4f4dcb..de9c122f268 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue @@ -18,13 +18,7 @@ export default { }; </script> <template> - <a - :href="link" - target="_blank" - rel="noopener noreferrer nofollow" - :class="cssClass" - > - {{ __('View app') }} - <icon name="external-link" /> + <a :href="link" target="_blank" rel="noopener noreferrer nofollow" :class="cssClass"> + {{ __('View app') }} <icon name="external-link" /> </a> </template> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue b/app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue index 01f707163d4..dd940548e30 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue @@ -14,21 +14,9 @@ export default { </script> <template> - <p - v-once - class="mr-info-list mr-links source-branch-removal-status append-bottom-0" - > - <span - class="status-text" - v-html="removesBranchText" - > - </span> - <i - v-tooltip - :title="tooltipTitle" - :aria-label="tooltipTitle" - class="fa fa-question-circle" - > + <p v-once class="mr-info-list mr-links source-branch-removal-status append-bottom-0"> + <span class="status-text" v-html="removesBranchText"> </span> + <i v-tooltip :title="tooltipTitle" :aria-label="tooltipTitle" class="fa fa-question-circle"> </i> </p> </template> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue index 2a76a878448..7ddcdd49df5 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue @@ -11,20 +11,14 @@ export default { <template> <div class="mr-widget-body media"> <div class="space-children"> - <status-icon - status="warning" - /> - <button - type="button" - class="btn btn-success btn-sm" - disabled="true" - > - {{ s__("mrWidget|Merge") }} + <status-icon status="warning" /> + <button type="button" class="btn btn-success btn-sm" disabled="true"> + {{ s__('mrWidget|Merge') }} </button> </div> <div class="media-body"> <span class="bold"> - {{ s__("mrWidget|This project is archived, write access has been disabled") }} + {{ s__('mrWidget|This project is archived, write access has been disabled') }} </span> </div> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue index 409fc2f2db4..a3a44dd8e99 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue @@ -35,8 +35,10 @@ export default { <status-icon status="warning" /> <div class="media-body space-children"> <span class="bold"> - <template v-if="mr.mergeError">{{ mr.mergeError }}.</template> - {{ s__("mrWidget|This merge request failed to be merged automatically") }} + <template v-if="mr.mergeError" + >{{ mr.mergeError }}.</template + > + {{ s__('mrWidget|This merge request failed to be merged automatically') }} </span> <button :disabled="isRefreshing" @@ -44,11 +46,8 @@ export default { class="btn btn-sm btn-default" @click="refreshWidget" > - <gl-loading-icon - v-if="isRefreshing" - :inline="true" - /> - {{ s__("mrWidget|Refresh") }} + <gl-loading-icon v-if="isRefreshing" :inline="true" /> + {{ s__('mrWidget|Refresh') }} </button> </div> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue index fdf0a9fd994..cf26003d038 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue @@ -10,14 +10,9 @@ export default { </script> <template> <div class="mr-widget-body media"> - <status-icon - :show-disabled-button="true" - status="loading" - /> + <status-icon :show-disabled-button="true" status="loading" /> <div class="media-body space-children"> - <span class="bold"> - {{ s__("mrWidget|Checking ability to merge automatically") }} - </span> + <span class="bold"> {{ s__('mrWidget|Checking ability to merge automatically') }} </span> </div> </div> </template> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue index f06eab95c7e..a5c75369fa1 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue @@ -21,9 +21,7 @@ export default { </script> <template> <div class="mr-widget-body media"> - <status-icon - status="warning" - /> + <status-icon status="warning" /> <div class="media-body"> <mr-widget-author-time :action-text="s__('mrWidget|Closed by')" @@ -34,13 +32,8 @@ export default { <section class="mr-info-list"> <p> - {{ s__("mrWidget|The changes were not merged into") }} - <a - :href="mr.targetBranchPath" - class="label-branch" - > - {{ mr.targetBranch }} - </a> + {{ s__('mrWidget|The changes were not merged into') }} + <a :href="mr.targetBranchPath" class="label-branch"> {{ mr.targetBranch }} </a> </p> </section> </div> 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 8c808296178..27352e0b2b1 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 @@ -19,25 +19,23 @@ export default { </script> <template> <div class="mr-widget-body media"> - <status-icon - :show-disabled-button="true" - status="warning" - /> + <status-icon :show-disabled-button="true" status="warning" /> <div class="media-body space-children"> - <span - v-if="mr.shouldBeRebased" - class="bold" - > - {{ s__(`mrWidget|Fast-forward merge is not possible. -To merge this request, first rebase locally.`) }} + <span v-if="mr.shouldBeRebased" class="bold"> + {{ + s__(`mrWidget|Fast-forward merge is not possible. +To merge this request, first rebase locally.`) + }} </span> <template v-else> <span class="bold"> - {{ s__("mrWidget|There are merge conflicts") }}<span v-if="!mr.canMerge">.</span> + {{ s__('mrWidget|There are merge conflicts') }}<span v-if="!mr.canMerge">.</span> <span v-if="!mr.canMerge"> - {{ s__(`mrWidget|Resolve these conflicts or ask someone - with write access to this repository to merge it locally`) }} + {{ + s__(`mrWidget|Resolve these conflicts or ask someone + with write access to this repository to merge it locally`) + }} </span> </span> <a @@ -45,7 +43,7 @@ To merge this request, first rebase locally.`) }} :href="mr.conflictResolutionPath" class="js-resolve-conflicts-button btn btn-default btn-sm" > - {{ s__("mrWidget|Resolve conflicts") }} + {{ s__('mrWidget|Resolve conflicts') }} </a> <button v-if="mr.canMerge" @@ -53,7 +51,7 @@ To merge this request, first rebase locally.`) }} data-toggle="modal" data-target="#modal_merge_info" > - {{ s__("mrWidget|Merge locally") }} + {{ s__('mrWidget|Merge locally') }} </button> </template> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue index c302960f16e..2a4dff71d9b 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue @@ -74,38 +74,18 @@ export default { <div class="mr-widget-body media"> <template v-if="isRefreshing"> <status-icon status="loading" /> - <span class="media-body bold js-refresh-label"> - {{ s__("mrWidget|Refreshing now") }} - </span> + <span class="media-body bold js-refresh-label"> {{ s__('mrWidget|Refreshing now') }} </span> </template> <template v-else> - <status-icon - :show-disabled-button="true" - status="warning" - /> + <status-icon :show-disabled-button="true" status="warning" /> <div class="media-body space-children"> <span class="bold"> - <span - v-if="mr.mergeError" - class="has-error-message" - > - {{ mergeError }}. - </span> - <span v-else> - {{ s__("mrWidget|Merge failed.") }} - </span> - <span - :class="{ 'has-custom-error': mr.mergeError }" - > - {{ timerText }} - </span> + <span v-if="mr.mergeError" class="has-error-message"> {{ mergeError }}. </span> + <span v-else> {{ s__('mrWidget|Merge failed.') }} </span> + <span :class="{ 'has-custom-error': mr.mergeError }"> {{ timerText }} </span> </span> - <button - class="btn btn-default btn-sm js-refresh-button" - type="button" - @click="refresh" - > - {{ s__("mrWidget|Refresh now") }} + <button class="btn btn-default btn-sm js-refresh-button" type="button" @click="refresh"> + {{ s__('mrWidget|Refresh now') }} </button> </div> </template> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue index 484b5600d63..02c76db4a50 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue @@ -84,9 +84,9 @@ export default { <div class="media-body"> <h4 class="d-flex align-items-start"> <span class="append-right-10"> - {{ s__("mrWidget|Set by") }} + {{ s__('mrWidget|Set by') }} <mr-widget-author :author="mr.setToMWPSBy" /> - {{ s__("mrWidget|to be merged automatically when the pipeline succeeds") }} + {{ s__('mrWidget|to be merged automatically when the pipeline succeeds') }} </span> <a v-if="mr.canCancelAutomaticMerge" @@ -94,35 +94,23 @@ export default { role="button" href="#" class="btn btn-sm btn-default js-cancel-auto-merge" - @click.prevent="cancelAutomaticMerge"> - <i - v-if="isCancellingAutoMerge" - class="fa fa-spinner fa-spin" - aria-hidden="true" - > - </i> - {{ s__("mrWidget|Cancel automatic merge") }} + @click.prevent="cancelAutomaticMerge" + > + <i v-if="isCancellingAutoMerge" class="fa fa-spinner fa-spin" aria-hidden="true"> </i> + {{ s__('mrWidget|Cancel automatic merge') }} </a> </h4> <section class="mr-info-list"> <p> - {{ s__("mrWidget|The changes will be merged into") }} - <a - :href="mr.targetBranchPath" - class="label-branch" - > - {{ mr.targetBranch }} - </a> + {{ s__('mrWidget|The changes will be merged into') }} + <a :href="mr.targetBranchPath" class="label-branch"> {{ mr.targetBranch }} </a> </p> <p v-if="mr.shouldRemoveSourceBranch"> - {{ s__("mrWidget|The source branch will be removed") }} + {{ s__('mrWidget|The source branch will be removed') }} </p> - <p - v-else - class="d-flex align-items-start" - > + <p v-else class="d-flex align-items-start"> <span class="append-right-10"> - {{ s__("mrWidget|The source branch will not be removed") }} + {{ s__('mrWidget|The source branch will not be removed') }} </span> <a v-if="canRemoveSourceBranch" @@ -132,13 +120,8 @@ export default { href="#" @click.prevent="removeSourceBranch" > - <i - v-if="isRemovingSourceBranch" - class="fa fa-spinner fa-spin" - aria-hidden="true" - > - </i> - {{ s__("mrWidget|Remove source branch") }} + <i v-if="isRemovingSourceBranch" class="fa fa-spinner fa-spin" aria-hidden="true"> </i> + {{ s__('mrWidget|Remove source branch') }} </a> </p> </section> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue index fb9ca897844..fe83fe58b67 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue @@ -154,7 +154,7 @@ export default { </div> <section class="mr-info-list"> <p> - {{ s__("mrWidget|The changes were merged into") }} + {{ s__('mrWidget|The changes were merged into') }} <span class="label-branch"> <a :href="mr.targetBranchPath">{{ mr.targetBranch }}</a> </span> @@ -174,27 +174,22 @@ export default { </template> </p> <p v-if="mr.sourceBranchRemoved"> - {{ s__("mrWidget|The source branch has been removed") }} + {{ s__('mrWidget|The source branch has been removed') }} </p> - <p - v-if="shouldShowRemoveSourceBranch" - class="space-children" - > - <span>{{ s__("mrWidget|You can remove source branch now") }}</span> + <p v-if="shouldShowRemoveSourceBranch" class="space-children"> + <span>{{ s__('mrWidget|You can remove source branch now') }}</span> <button :disabled="isMakingRequest" type="button" class="btn btn-sm btn-default js-remove-branch-button" @click="removeSourceBranch" > - {{ s__("mrWidget|Remove Source Branch") }} + {{ s__('mrWidget|Remove Source Branch') }} </button> </p> <p v-if="shouldShowSourceBranchRemoving"> <gl-loading-icon :inline="true" /> - <span> - {{ s__("mrWidget|The source branch is being removed") }} - </span> + <span> {{ s__('mrWidget|The source branch is being removed') }} </span> </p> </section> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue index 139e64d1878..0655eef6504 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue @@ -19,12 +19,10 @@ export default { <div class="mr-widget-body mr-state-locked media"> <status-icon status="loading" /> <div class="media-body"> - <h4> - {{ s__("mrWidget|This merge request is in the process of being merged") }} - </h4> + <h4>{{ s__('mrWidget|This merge request is in the process of being merged') }}</h4> <section class="mr-info-list"> <p> - {{ s__("mrWidget|The changes will be merged into") }} + {{ s__('mrWidget|The changes will be merged into') }} <span class="label-branch"> <a :href="mr.targetBranchPath">{{ mr.targetBranch }}</a> </span> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue index 227e9b85f9d..e9aac8b385c 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue @@ -46,24 +46,13 @@ export default { </script> <template> <div class="mr-widget-body media"> - <status-icon - :show-disabled-button="true" - status="warning" - /> + <status-icon :show-disabled-button="true" status="warning" /> <div class="media-body space-children"> <span class="bold js-branch-text"> - <span class="capitalize"> - {{ missingBranchName }} - </span> {{ s__("mrWidget|branch does not exist.") }} - {{ missingBranchNameMessage }} - <i - v-tooltip - :title="message" - :aria-label="message" - class="fa fa-question-circle" - > - </i> + <span class="capitalize"> {{ missingBranchName }} </span> + {{ s__('mrWidget|branch does not exist.') }} {{ missingBranchNameMessage }} + <i v-tooltip :title="message" :aria-label="message" class="fa fa-question-circle"> </i> </span> </div> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue index 360559ae0f0..c203d2824fa 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue @@ -11,14 +11,13 @@ export default { <template> <div class="mr-widget-body media"> - <status-icon - :show-disabled-button="true" - status="success" - /> + <status-icon :show-disabled-button="true" status="success" /> <div class="media-body space-children"> <span class="bold"> - {{ s__(`mrWidget|Ready to be merged automatically. -Ask someone with write access to this repository to merge this request`) }} + {{ + s__(`mrWidget|Ready to be merged automatically. +Ask someone with write access to this repository to merge this request`) + }} </span> </div> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue index a4eb5afb21c..6331a7d8388 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue @@ -10,14 +10,13 @@ export default { </script> <template> <div class="mr-widget-body media"> - <status-icon - :show-disabled-button="true" - status="warning" - /> + <status-icon :show-disabled-button="true" status="warning" /> <div class="media-body space-children"> <span class="bold"> - {{ s__(`mrWidget|Pipeline blocked. -The pipeline for this merge request requires a manual action to proceed`) }} + {{ + s__(`mrWidget|Pipeline blocked. +The pipeline for this merge request requires a manual action to proceed`) + }} </span> </div> </div> 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 5a7f6cc36fa..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 @@ -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> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue index e73b7e410d5..a38495bb4cc 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue @@ -23,21 +23,16 @@ export default { </div> <div class="text col-md-7 order-md-first col-12"> <span> - Merge requests are a place to propose changes you have made to a project - and discuss those changes with others. + Merge requests are a place to propose changes you have made to a project and discuss those + changes with others. </span> + <p>Interested parties can even contribute by pushing commits if they want to.</p> <p> - Interested parties can even contribute by pushing commits if they want to. - </p> - <p> - Currently there are no changes in this merge request's source branch. - Please push new commits or use a different branch. + Currently there are no changes in this merge request's source branch. Please push new + commits or use a different branch. </p> <div> - <a - v-if="mr.newBlobPath" - :href="mr.newBlobPath" - class="btn btn-inverted btn-success"> + <a v-if="mr.newBlobPath" :href="mr.newBlobPath" class="btn btn-inverted btn-success"> Create file </a> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue index 2bb1a34412e..5f56157cb89 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue @@ -11,14 +11,13 @@ export default { <template> <div class="mr-widget-body media"> - <status-icon - :show-disabled-button="true" - status="warning" - /> + <status-icon :show-disabled-button="true" status="warning" /> <div class="media-body space-children"> <span class="bold"> - {{ s__(`mrWidget|The pipeline for this merge request failed. -Please retry the job or push a new commit to fix the failure`) }} + {{ + s__(`mrWidget|The pipeline for this merge request failed. +Please retry the job or push a new commit to fix the failure`) + }} </span> </div> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue index e7baecbcde4..84c8a3464a5 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue @@ -249,12 +249,9 @@ export default { :class="mergeButtonClass" type="button" class="qa-merge-button" - @click="handleMergeButtonClick()"> - <i - v-if="isMakingRequest" - class="fa fa-spinner fa-spin" - aria-hidden="true" - ></i> + @click="handleMergeButtonClick();" + > + <i v-if="isMakingRequest" class="fa fa-spinner fa-spin" aria-hidden="true"></i> {{ mergeButtonText }} </button> <button @@ -263,26 +260,23 @@ export default { type="button" class="btn btn-sm btn-info dropdown-toggle js-merge-moment" data-toggle="dropdown" - aria-label="Select merge moment"> - <i - class="fa fa-chevron-down qa-merge-moment-dropdown" - aria-hidden="true" - ></i> + aria-label="Select merge moment" + > + <i class="fa fa-chevron-down qa-merge-moment-dropdown" aria-hidden="true"></i> </button> <ul v-if="shouldShowMergeOptionsDropdown" class="dropdown-menu dropdown-menu-right" - role="menu"> + role="menu" + > <li> <a class="merge_when_pipeline_succeeds qa-merge-when-pipeline-succeeds-option" href="#" - @click.prevent="handleMergeButtonClick(true)"> + @click.prevent="handleMergeButtonClick(true);" + > <span class="media"> - <span - class="merge-opt-icon" - aria-hidden="true" - v-html="successSvg"></span> + <span class="merge-opt-icon" aria-hidden="true" v-html="successSvg"></span> <span class="media-body merge-opt-title">Merge when pipeline succeeds</span> </span> </a> @@ -291,12 +285,10 @@ export default { <a class="accept-merge-request qa-merge-immediately-option" href="#" - @click.prevent="handleMergeButtonClick(false, true)"> + @click.prevent="handleMergeButtonClick(false, true);" + > <span class="media"> - <span - class="merge-opt-icon" - aria-hidden="true" - v-html="warningSvg"></span> + <span class="merge-opt-icon" aria-hidden="true" v-html="warningSvg"></span> <span class="media-body merge-opt-title">Merge immediately</span> </span> </a> @@ -311,18 +303,19 @@ export default { v-model="removeSourceBranch" :disabled="isRemoveSourceBranchButtonDisabled" class="js-remove-source-branch-checkbox" - type="checkbox"/> Remove source branch + type="checkbox" + /> + Remove source branch </label> <!-- Placeholder for EE extension of this component --> <squash-before-merge v-if="shouldShowSquashBeforeMerge" :mr="mr" - :is-merge-button-disabled="isMergeButtonDisabled" /> + :is-merge-button-disabled="isMergeButtonDisabled" + /> - <span - v-if="mr.ffOnlyEnabled" - class="js-fast-forward-message"> + <span v-if="mr.ffOnlyEnabled" class="js-fast-forward-message"> Fast-forward merge without a merge commit </span> <button @@ -330,7 +323,8 @@ export default { :disabled="isMergeButtonDisabled" class="js-modify-commit-message-button btn btn-default btn-sm" type="button" - @click="toggleCommitMessageEditor"> + @click="toggleCommitMessageEditor" + > Modify commit message </button> </template> @@ -341,15 +335,9 @@ export default { </template> </div> </div> - <div - v-if="showCommitMessageEditor" - class="prepend-top-default commit-message-editor"> + <div v-if="showCommitMessageEditor" class="prepend-top-default commit-message-editor"> <div class="form-group clearfix"> - <label - class="col-form-label" - for="commit-message"> - Commit message - </label> + <label class="col-form-label" for="commit-message"> Commit message </label> <div class="col-sm-10"> <div class="commit-message-container"> <div class="max-width-marker"></div> @@ -359,18 +347,14 @@ export default { class="form-control js-commit-message" required="required" rows="14" - name="Commit message"></textarea> + name="Commit message" + ></textarea> </div> <p class="hint"> Try to keep the first line under 52 characters and the others under 72 </p> <div class="hint"> - <a - href="#" - @click.prevent="updateCommitMessage" - > - {{ commitMessageLinkTitle }} - </a> + <a href="#" @click.prevent="updateCommitMessage"> {{ commitMessageLinkTitle }} </a> </div> </div> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue index 16c903c923f..8acca0d6481 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue @@ -11,14 +11,13 @@ export default { <template> <div class="mr-widget-body media"> - <status-icon - :show-disabled-button="true" - status="warning" - /> + <status-icon :show-disabled-button="true" status="warning" /> <div class="media-body space-children"> <span class="bold"> - {{ s__(`mrWidget|The source branch HEAD has recently changed. -Please reload the page and review the changes before merging`) }} + {{ + s__(`mrWidget|The source branch HEAD has recently changed. +Please reload the page and review the changes before merging`) + }} </span> </div> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue index 25ad329e196..e71acf0d7dd 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue @@ -55,9 +55,7 @@ export default { rel="noopener noreferrer nofollow" data-container="body" > - <icon - name="question-o" - /> + <icon name="question-o" /> </a> </div> </template> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue index 5eb2058a03b..a9fb40a4949 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue @@ -17,20 +17,17 @@ export default { <template> <div class="mr-widget-body media"> - <status-icon - :show-disabled-button="true" - status="warning" - /> + <status-icon :show-disabled-button="true" status="warning" /> <div class="media-body space-children"> <span class="bold"> - {{ s__("mrWidget|There are unresolved discussions. Please resolve these discussions") }} + {{ s__('mrWidget|There are unresolved discussions. Please resolve these discussions') }} </span> <a v-if="mr.createIssueToResolveDiscussionsPath" :href="mr.createIssueToResolveDiscussionsPath" class="btn btn-default btn-sm js-create-issue" > - {{ s__("mrWidget|Create an issue to resolve them later") }} + {{ s__('mrWidget|Create an issue to resolve them later') }} </a> </div> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue index 9129fcbb918..7c322388d30 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue @@ -43,10 +43,7 @@ export default { <template> <div class="mr-widget-body media"> - <status-icon - :show-disabled-button="Boolean(mr.removeWIPPath)" - status="warning" - /> + <status-icon :show-disabled-button="Boolean(mr.removeWIPPath)" status="warning" /> <div class="media-body space-children"> <span class="bold"> This is a Work in Progress @@ -56,7 +53,8 @@ export default { title="When this merge request is ready, remove the WIP: prefix from the title to allow it to be merged" aria-label="When this merge request is ready, - remove the WIP: prefix from the title to allow it to be merged"> + remove the WIP: prefix from the title to allow it to be merged" + > </i> </span> <button @@ -64,13 +62,10 @@ export default { :disabled="isMakingRequest" type="button" class="btn btn-default btn-sm js-remove-wip" - @click="removeWIP"> - <i - v-if="isMakingRequest" - class="fa fa-spinner fa-spin" - aria-hidden="true"> - </i> - Resolve WIP status + @click="removeWIP" + > + <i v-if="isMakingRequest" class="fa fa-spinner fa-spin" aria-hidden="true"> </i> Resolve WIP + status </button> </div> </div> |