diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-18 15:10:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-18 15:10:46 +0000 |
| commit | 346c2ebb5a818524c5d8d95dc6b9fc8c892e3b5c (patch) | |
| tree | 63bf068a9d8cedf0b7f9e80cf99e491813617db1 /app/assets/javascripts/vue_merge_request_widget | |
| parent | 5f287a8e306da1e0b6152a0b7f8621a8e71a3fe4 (diff) | |
| download | gitlab-ce-346c2ebb5a818524c5d8d95dc6b9fc8c892e3b5c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue index 75831643f6a..0cd280c42d2 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue @@ -169,6 +169,7 @@ export default { role="button" href="#" class="btn btn-sm btn-default js-cancel-auto-merge" + data-qa-selector="cancel_auto_merge_button" data-testid="cancelAutomaticMergeButton" @click.prevent="cancelAutomaticMerge" > |