diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-06-02 11:05:38 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-06-02 11:05:38 +0300 |
commit | ea531e1effa51bcec84e50a69901e6eec7c789c1 (patch) | |
tree | d3c1281deea1c9b2e8596cfa79a2e9d5cd4f7a10 /app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js | |
parent | 4d141cb30dfcad94db89bdc08f4ea907dc2f8bdf (diff) | |
parent | fc56d2fbaa2a317813c9dd7ba36e584162175fe6 (diff) | |
download | gitlab-ce-ea531e1effa51bcec84e50a69901e6eec7c789c1.tar.gz |
Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-ui
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js new file mode 100644 index 00000000000..8515b54e62d --- /dev/null +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js @@ -0,0 +1,19 @@ +export default { + name: 'MRWidgetChecking', + template: ` + <div class="mr-widget-body"> + <button + type="button" + class="btn btn-success btn-small" + disabled="true"> + Merge + </button> + <span class="bold"> + Checking ability to merge automatically. + <i + class="fa fa-spinner fa-spin" + aria-hidden="true" /> + </span> + </div> + `, +}; |