summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js
index 9fb89a99175..4da5e03590c 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js
@@ -28,9 +28,6 @@ export default {
</button>
<span class="bold danger">
This merge request failed to be merged automatically.
- </span>
- <div class="merge-error-text">
- {{mr.mergeError}}
<button
@click="refreshWidget"
:class="{ disabled: isRefreshing }"
@@ -42,6 +39,9 @@ export default {
aria-hidden="true" />
Refresh
</button>
+ </span>
+ <div class="merge-error-text">
+ {{mr.mergeError}}
</div>
</div>
`,