diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-02-16 19:53:47 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-02-16 19:53:47 +0000 |
| commit | 306e0d16896f173667b0f7378ef117c6054e2676 (patch) | |
| tree | 5dcff17fd2a750d77065a779ad3038a82eb8bba5 /app/assets | |
| parent | dfb14e4d22aa91d9d3fbcee5c7e44ae61bf18c51 (diff) | |
| parent | 8469725ec4a43b24f825017c5447529f9b4a2cc8 (diff) | |
| download | gitlab-ce-306e0d16896f173667b0f7378ef117c6054e2676.tar.gz | |
Merge branch 'fl-refresh-btn' into 'master'
Show loading button inline in MR widget
See merge request gitlab-org/gitlab-ce!17174
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue | 5 |
1 files changed, 4 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 40c3cb500bb..ebaf2b972eb 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 @@ -44,7 +44,10 @@ type="button" class="btn btn-xs btn-default" > - <loading-icon v-if="isRefreshing" /> + <loading-icon + v-if="isRefreshing" + :inline="true" + /> {{ s__("mrWidget|Refresh") }} </button> </div> |