summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-06 03:11:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-06 03:11:28 +0000
commitc855426afdc9c081fbb16b9df9249b0cb117a25c (patch)
treeaf0caa97dd2c98a9277adcbc370820604fe952a8 /qa
parent49f32104434abc51d6a115fe214f0bf6b420d3bc (diff)
downloadgitlab-ce-c855426afdc9c081fbb16b9df9249b0cb117a25c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/page/project/settings/merge_request.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/qa/qa/page/project/settings/merge_request.rb b/qa/qa/page/project/settings/merge_request.rb
index c42a4e0bebe..3530726feeb 100644
--- a/qa/qa/page/project/settings/merge_request.rb
+++ b/qa/qa/page/project/settings/merge_request.rb
@@ -27,11 +27,6 @@ module QA
choose_element(:merge_ff_radio, true)
click_save_changes
end
-
- def enable_merge_if_all_disscussions_are_resolved
- check_element(:only_allow_merge_if_all_discussions_are_resolved_checkbox, true)
- click_save_changes
- end
end
end
end