diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 19:09:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 19:09:54 +0300 |
| commit | 2f26f81ce3e3f97ddc5ce5e2e103925d7d0d170f (patch) | |
| tree | 95a89f97b5a10375e5d104a51c64fbfe36642877 /app/assets/javascripts/vue_merge_request_widget/components/states | |
| parent | 8b61452138ecc511b52cd49be4ee6b8a80390c50 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue index 11bc8c73ee9..75d1e5865b0 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue @@ -84,7 +84,12 @@ export default { <span v-else> {{ s__('mrWidget|Merge failed.') }} </span> <span :class="{ 'has-custom-error': mr.mergeError }"> {{ timerText }} </span> </span> - <button class="btn btn-default btn-sm js-refresh-button" type="button" @click="refresh"> + <button + class="btn btn-default btn-sm js-refresh-button" + data-qa-selector="merge_request_error_content" + type="button" + @click="refresh" + > {{ s__('mrWidget|Refresh now') }} </button> </div> |