diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-19 15:56:34 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-19 15:56:34 +0000 |
| commit | 33233123bafb2dbc455cea730aa5cc45abc95e35 (patch) | |
| tree | 15c5a466e7d8f1a55d78dd35541e5b6b9601374d /app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js | |
| parent | 1b51018eeda7fd98c519a240a222f4184359c5aa (diff) | |
| download | gitlab-ce-33233123bafb2dbc455cea730aa5cc45abc95e35.tar.gz | |
Backport to match EE icons42225-mr-icons
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js index af19cf6ab87..46687cc85e1 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js @@ -7,7 +7,7 @@ export default { }, template: ` <div class="mr-widget-body media"> - <status-icon status="failed" :show-disabled-button="true" /> + <status-icon status="warning" :show-disabled-button="true" /> <div class="media-body space-children"> <span class="bold"> The source branch HEAD has recently changed. Please reload the page and review the changes before merging |