Manually add back these two failing specs

2f151d1f · Thong Kuah · 95f34167 · 2f151d1f
Commit 2f151d1f authored Sep 02, 2021 by Thong Kuah
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

spec/support/database/cross-join-allowlist.yml spec/support/database/cross-join-allowlist.yml +2 -0

No files found.
--- a/spec/support/database/cross-join-allowlist.yml
+++ b/spec/support/database/cross-join-allowlist.yml
@@ -135,6 +135,7 @@
 - "./spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb"
 - "./spec/features/issues/notes_on_issues_spec.rb"
 - "./spec/features/issues/user_creates_branch_and_merge_request_spec.rb"
+- "./spec/features/issues/user_creates_confidential_merge_request_spec.rb"
 - "./spec/features/markdown/gitlab_flavored_markdown_spec.rb"
 - "./spec/features/merge_request/batch_comments_spec.rb"
 - "./spec/features/merge_request/close_reopen_report_toggle_spec.rb"
@@ -162,6 +163,7 @@
 - "./spec/features/merge_request/user_manages_subscription_spec.rb"
 - "./spec/features/merge_request/user_marks_merge_request_as_draft_spec.rb"
 - "./spec/features/merge_request/user_merges_immediately_spec.rb"
+- "./spec/features/merge_request/user_merges_merge_request_spec.rb"
 - "./spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb"
 - "./spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb"
 - "./spec/features/merge_request/user_posts_diff_notes_spec.rb"