diff options
author | Simon Knox <psimyn@gmail.com> | 2017-08-07 05:29:37 +0300 |
---|---|---|
committer | Simon Knox <psimyn@gmail.com> | 2017-08-07 06:20:33 +0300 |
commit | bce029a23bc0c46088da989aa053f20438b2f2db (patch) | |
tree | f6947ce68995053ab1426f39ed2ef1abc6b22a39 /app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js | |
parent | 4b3011e1c20077470ce946d703d98259f88ef268 (diff) |
clean up merge request widget UI
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js index 002820123ca..c5be9a0530a 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js @@ -1,16 +1,18 @@ +import statusIcon from '../mr_widget_status_icon'; + export default { name: 'MRWidgetPipelineBlocked', + components: { + statusIcon, + }, template: ` - <div class="mr-widget-body"> - <button - class="btn btn-success btn-small" - disabled="true" - type="button"> - Merge - </button> - <span class="bold"> - The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure. - </span> + <div class="mr-widget-body media"> + <status-icon status="failed" showDisabledButton /> + <div class="media-body space-children"> + <span class="bold"> + The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure + </span> + </div> </div> `, }; |