Merge branch '301110-merge-train-test-selector' into 'master'

Add a data-qa-selector for merge_button See merge request gitlab-org/gitlab!53461

Merge branch '301110-merge-train-test-selector' into 'master'
Add a data-qa-selector for merge_button See merge request gitlab-org/gitlab!53461
7d5e974b · Martin Wortschack · d212e78d · 56e137ba · 7d5e974b
Commit 7d5e974b authored Feb 05, 2021 by Martin Wortschack
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue ...merge_request_widget/components/states/ready_to_merge.vue +1 -0

No files found.
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -459,6 +459,7 @@ export default {
                :variant="mergeButtonVariant"
                :disabled="isMergeButtonDisabled"
                :loading="isMakingRequest"
+                data-qa-selector="merge_button"
                @click="handleMergeButtonClick(isAutoMergeAvailable)"
                >{{ mergeButtonText }}</gl-button
              >