summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-05-11 04:53:35 +0000
committerStan Hu <stanhu@gmail.com>2019-05-11 04:53:35 +0000
commit894c8e235bb30c1506b69a609b8d65240f7a6814 (patch)
treec205036eed8b8dc49007d29fecfa2634faa66825
parent27ae3c2a6bfcffbdd8e3b5436cf46312882e0633 (diff)
parenta4fea21ee78cbd4b257b2f18aa259d46945827dc (diff)
downloadgitlab-ce-894c8e235bb30c1506b69a609b8d65240f7a6814.tar.gz
Merge branch 'include-ee-fixtures' into 'master'12-0-auto-deploy-0009646
Add EE fixtures to SeedFu fixture paths See merge request gitlab-org/gitlab-ce!28241
-rw-r--r--changelogs/unreleased/include-ee-fixtures.yml5
-rw-r--r--config/initializers/seed_fu.rb4
2 files changed, 9 insertions, 0 deletions
diff --git a/changelogs/unreleased/include-ee-fixtures.yml b/changelogs/unreleased/include-ee-fixtures.yml
new file mode 100644
index 00000000000..ba500d92de3
--- /dev/null
+++ b/changelogs/unreleased/include-ee-fixtures.yml
@@ -0,0 +1,5 @@
+---
+title: Add EE fixtures to SeedFu list
+merge_request: 28241
+author:
+type: other
diff --git a/config/initializers/seed_fu.rb b/config/initializers/seed_fu.rb
new file mode 100644
index 00000000000..2e48e41a311
--- /dev/null
+++ b/config/initializers/seed_fu.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+if Gitlab.ee?
+ SeedFu.fixture_paths += %W[ee/db/fixtures ee/db/fixtures/#{Rails.env}]
+end