diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-11 07:53:35 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-05-16 20:22:49 +0300 |
| commit | abac5047f5f6a8cde5bd539b22a5995e6ab2f01a (patch) | |
| tree | d3e4922411d4c8ac06a78cc7bbaefcbe707b0166 | |
| parent | 335fd73f07b5a704c043dbc14559814be0a87652 (diff) | |
Merge branch 'include-ee-fixtures' into 'master'
Add EE fixtures to SeedFu fixture paths
See merge request gitlab-org/gitlab-ce!28241
(cherry picked from commit 894c8e235bb30c1506b69a609b8d65240f7a6814)
a4fea21e Add EE fixtures to SeedFu path
| -rw-r--r-- | changelogs/unreleased/include-ee-fixtures.yml | 5 | ||||
| -rw-r--r-- | config/initializers/seed_fu.rb | 4 |
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 |