diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-19 12:15:01 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-05-19 12:15:01 +0300 |
| commit | a9ad1b61e5c04f6c9cdb04244e30a6bf6b477e1a (patch) | |
| tree | 7a8c391f033a0754bfcd9769a6e049aa530f159d | |
| parent | 0aa5e98a59346feb4ec7debfc015174236a3ccf4 (diff) | |
| download | gitlab-ce-a9ad1b61e5c04f6c9cdb04244e30a6bf6b477e1a.tar.gz | |
MRWidget: Change refresh button place in failed state.
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js index 9fb89a99175..4da5e03590c 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js @@ -28,9 +28,6 @@ export default { </button> <span class="bold danger"> This merge request failed to be merged automatically. - </span> - <div class="merge-error-text"> - {{mr.mergeError}} <button @click="refreshWidget" :class="{ disabled: isRefreshing }" @@ -42,6 +39,9 @@ export default { aria-hidden="true" /> Refresh </button> + </span> + <div class="merge-error-text"> + {{mr.mergeError}} </div> </div> `, |