Automatic merge of gitlab-org/gitlab-ce master

c8670321 · GitLab Bot · ba555273 · 894c8e23 · c8670321 · c8670321
Commit c8670321 authored May 11, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

changelogs/unreleased/include-ee-fixtures.yml changelogs/unreleased/include-ee-fixtures.yml +5 -0

config/initializers/seed_fu.rb config/initializers/seed_fu.rb +4 -0

No files found.
--- a/changelogs/unreleased/include-ee-fixtures.yml
+++ b/changelogs/unreleased/include-ee-fixtures.yml
+---
+title: Add EE fixtures to SeedFu list
+merge_request: 28241
+author:
+type: other
--- a/config/initializers/seed_fu.rb
+++ b/config/initializers/seed_fu.rb
+# frozen_string_literal: true
+if Gitlab.ee?
+  SeedFu.fixture_paths += %W[ee/db/fixtures ee/db/fixtures/#{Rails.env}]
+end