Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 3 deletions

diff --git a/scripts/decomposition/generate-loose-foreign-key b/scripts/decomposition/generate-loose-foreign-key
index 860da926594..35f84c64ce1 100755
--- a/scripts/decomposition/generate-loose-foreign-key
+++ b/scripts/decomposition/generate-loose-foreign-key
@@ -107,7 +107,7 @@ def columns(*args)
 end
 
 def add_definition_to_yaml(definition)
-  content = YAML.load_file(Rails.root.join('lib/gitlab/database/gitlab_loose_foreign_keys.yml'))
+  content = YAML.load_file(Rails.root.join('config/gitlab_loose_foreign_keys.yml'))
   table_definitions = content[definition.from_table]
 
   # insert new entry at random place to avoid conflicts
@@ -148,11 +148,11 @@ def add_definition_to_yaml(definition)
 
   # emulate existing formatting
   File.write(
-    Rails.root.join('lib/gitlab/database/gitlab_loose_foreign_keys.yml'),
+    Rails.root.join('config/gitlab_loose_foreign_keys.yml'),
     content.to_yaml.gsub(/^([- ] )/, '  \1')
   )
 
-  exec_cmd("git", "add", "lib/gitlab/database/gitlab_loose_foreign_keys.yml")
+  exec_cmd("git", "add", "config/gitlab_loose_foreign_keys.yml")
 end
 
 def generate_migration(definition)