From 0aa5e98a59346feb4ec7debfc015174236a3ccf4 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Fri, 19 May 2017 04:06:08 +0300
Subject: [PATCH 1/3] MRWidget: Add refresh button into MR widget failed state.
---
.../states/mr_widget_auto_merge_failed.js | 26 +++++++++++++++++++
1 file changed, 26 insertions(+)
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 fcccb17f58d..9fb89a99175 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
@@ -1,8 +1,23 @@
+import eventHub from '../../event_hub';
+
export default {
name: 'MRWidgetAutoMergeFailed',
props: {
mr: { type: Object, required: true },
},
+ data() {
+ return {
+ isRefreshing: false,
+ };
+ },
+ methods: {
+ refreshWidget() {
+ this.isRefreshing = true;
+ eventHub.$emit('MRWidgetUpdateRequested', () => {
+ this.isRefreshing = false;
+ });
+ },
+ },
template: `
<div class="mr-widget-body">
<button
@@ -16,6 +31,17 @@ export default {
</span>
<div class="merge-error-text">
{{mr.mergeError}}
+ <button
+ @click="refreshWidget"
+ :class="{ disabled: isRefreshing }"
+ type="button"
+ class="btn btn-xs btn-default">
+ <i
+ v-if="isRefreshing"
+ class="fa fa-spinner fa-spin"
+ aria-hidden="true" />
+ Refresh
+ </button>
</div>
</div>
`,
--
GitLab
From a9ad1b61e5c04f6c9cdb04244e30a6bf6b477e1a Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Fri, 19 May 2017 12:15:01 +0300
Subject: [PATCH 2/3] MRWidget: Change refresh button place in failed state.
---
.../components/states/mr_widget_auto_merge_failed.js | 6 +++---
1 file 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>
`,
--
GitLab
From 1514dd358120ca1da9f6902383e9a7fb76dc8651 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Fri, 19 May 2017 12:31:18 +0300
Subject: [PATCH 3/3] MRWidget: Make error message bold and red.
---
.../components/states/mr_widget_auto_merge_failed.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 4da5e03590c..4063859d5d0 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
@@ -40,7 +40,7 @@ export default {
Refresh
</button>
</span>
- <div class="merge-error-text">
+ <div class="merge-error-text danger bold">
{{mr.mergeError}}
</div>
</div>
--
GitLab