diff options
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue | 13 |
1 files changed, 6 insertions, 7 deletions
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> |