Merge branch '323421-qe-fix-merge-trains-spec' into 'master'

Expand merge request settings in the failing E2E spec

See merge request gitlab-org/gitlab!55743

qa/qa/specs/features/ee/browser_ui/4_verify/new_discussion_not_dropping_merge_trains_mr_spec.rb

@@ -35,12 +35,9 @@ module QA
           Flow::Login.sign_in
           project.visit!
 
-          Page::Project::Menu.perform(&:go_to_general_settings)
+          Flow::MergeRequest.enable_merge_trains
           Page::Project::Settings::Main.perform(&:expand_merge_requests_settings)
-          Page::Project::Settings::MergeRequest.perform do |setting|
-            setting.enable_merge_train
-            setting.enable_merge_if_all_disscussions_are_resolved
-          end
+          Page::Project::Settings::MergeRequest.perform(&:enable_merge_if_all_disscussions_are_resolved)
 
           commit_ci_file