summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-01-19 15:31:22 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-01-19 15:31:22 +0000
commitde6c27f64a822c2d32e04451d6187925cf58de82 (patch)
treeff551ebdc61582424229b460465765906516ae90
parent13827e10ef78a021b882c1ac2b226201f057335e (diff)
downloadgitlab-ce-vue-mr-widget-state.tar.gz
Update icon to match EEvue-mr-widget-state
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue2
1 files changed, 1 insertions, 1 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 e2aa109d610..77dd243d617 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
@@ -32,7 +32,7 @@
</script>
<template>
<div class="mr-widget-body media">
- <status-icon status="failed" />
+ <status-icon status="warning" />
<div class="media-body space-children">
<span class="bold">
<template v-if="mr.mergeError">{{ mr.mergeError }}.</template>