diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
| commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
| tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /db/fixtures | |
| parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'db/fixtures')
| -rw-r--r-- | db/fixtures/development/001_create_base_work_item_types.rb | 5 | ||||
| -rw-r--r-- | db/fixtures/development/31_error_tracking.rb | 5 | ||||
| -rw-r--r-- | db/fixtures/production/003_create_base_work_item_types.rb | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/db/fixtures/development/001_create_base_work_item_types.rb b/db/fixtures/development/001_create_base_work_item_types.rb new file mode 100644 index 00000000000..7a541ca20b0 --- /dev/null +++ b/db/fixtures/development/001_create_base_work_item_types.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +Gitlab::Seeder.quiet do + Gitlab::DatabaseImporters::WorkItems::BaseTypeImporter.import +end diff --git a/db/fixtures/development/31_error_tracking.rb b/db/fixtures/development/31_error_tracking.rb index 60e288696f8..d4d59f4046a 100644 --- a/db/fixtures/development/31_error_tracking.rb +++ b/db/fixtures/development/31_error_tracking.rb @@ -33,11 +33,6 @@ Gitlab::Seeder.quiet do Project.not_mass_generated.visible_to_user(admin_user).sample(1).each do |project| puts "\nActivating integrated error tracking for the '#{project.full_path}' project" - unless Feature.enabled?(:integrated_error_tracking, project) - puts '- enabling feature flag' - Feature.enable(:integrated_error_tracking, project) - end - puts '- enabling in settings' project.error_tracking_setting || project.create_error_tracking_setting project.error_tracking_setting.update!(enabled: true, integrated: true) diff --git a/db/fixtures/production/003_create_base_work_item_types.rb b/db/fixtures/production/003_create_base_work_item_types.rb new file mode 100644 index 00000000000..7a541ca20b0 --- /dev/null +++ b/db/fixtures/production/003_create_base_work_item_types.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +Gitlab::Seeder.quiet do + Gitlab::DatabaseImporters::WorkItems::BaseTypeImporter.import +end |