diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-18 21:02:26 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-18 21:02:26 +0000 |
| commit | bf1b26eadf3cb6f2ae8231def2c34b3fa0a704a1 (patch) | |
| tree | 9da8f159347266207a19ec1aee6c165e8f797791 | |
| parent | e7a6531b9d163d384a1d0471024141b3f5827bbf (diff) | |
| download | gitlab-ce-bf1b26eadf3cb6f2ae8231def2c34b3fa0a704a1.tar.gz | |
Fix conflict with ee iconmr-widget-vue
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue | 2 |
1 files changed, 1 insertions, 1 deletions
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 552b3e6726d..afa9cc57544 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 @@ -12,7 +12,7 @@ <div class="mr-widget-body media"> <div class="space-children"> <status-icon - status="failed" + status="warning" /> <button type="button" |