Commit f842475e authored by Thong Kuah's avatar Thong Kuah

Merge branch 'mv_cross_join_yml_to_spec' into 'master'

Move cross-join yml to inside spec/ directory

See merge request gitlab-org/gitlab!69344
parents 9f680937 b36aeeb7
...@@ -81,7 +81,7 @@ end ...@@ -81,7 +81,7 @@ end
Gitlab::Database.singleton_class.prepend( Gitlab::Database.singleton_class.prepend(
Database::PreventCrossJoins::GitlabDatabaseMixin) Database::PreventCrossJoins::GitlabDatabaseMixin)
ALLOW_LIST = Set.new(YAML.load_file(Rails.root.join('.cross-join-allowlist.yml'))).freeze ALLOW_LIST = Set.new(YAML.load_file(File.join(__dir__, 'cross-join-allowlist.yml'))).freeze
RSpec.configure do |config| RSpec.configure do |config|
config.include(::Database::PreventCrossJoins::SpecHelpers) config.include(::Database::PreventCrossJoins::SpecHelpers)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment