diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-07 09:11:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-07 09:11:06 +0300 |
| commit | 777dc3053f8433a9f5c9cc868325e16eac5d93e5 (patch) | |
| tree | a48494d384fc4a8ac5a356821844214e0e8a6fc2 /spec/support/database | |
| parent | 86db9fdda7bc7d0d709c5fef5f7c75a849d6f702 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/database')
| -rw-r--r-- | spec/support/database/cross-join-allowlist.yml | 1 | ||||
| -rw-r--r-- | spec/support/database/prevent_cross_joins.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/spec/support/database/cross-join-allowlist.yml b/spec/support/database/cross-join-allowlist.yml index 8047fe434ed..8d0331f2298 100644 --- a/spec/support/database/cross-join-allowlist.yml +++ b/spec/support/database/cross-join-allowlist.yml @@ -182,7 +182,6 @@ - "./spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb" - "./spec/features/merge_request/user_sees_merge_widget_spec.rb" - "./spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb" -- "./spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb" - "./spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb" - "./spec/features/merge_request/user_sees_pipelines_from_forked_project_spec.rb" - "./spec/features/merge_request/user_sees_pipelines_spec.rb" diff --git a/spec/support/database/prevent_cross_joins.rb b/spec/support/database/prevent_cross_joins.rb index 52c7bb49c50..4b78aa9014c 100644 --- a/spec/support/database/prevent_cross_joins.rb +++ b/spec/support/database/prevent_cross_joins.rb @@ -47,7 +47,7 @@ module Database Thread.current[:has_cross_join_exception] = true raise CrossJoinAcrossUnsupportedTablesError, "Unsupported cross-join across '#{tables.join(", ")}' modifying '#{schemas.to_a.join(", ")}' discovered " \ - "when executing query '#{sql}'" + "when executing query '#{sql}'. Please refer to https://docs.gitlab.com/ee/development/database/multiple_databases.html#removing-joins-between-ci_-and-non-ci_-tables for details on how to resolve this exception." end end |