diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
| commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
| tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /spec/spec_helper.rb | |
| parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
| download | gitlab-ce-1f5bd14001245a518cecb87d251dddcde78b9bfb.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 23083203cfe..f33c6e64b0c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -109,12 +109,12 @@ RSpec.configure do |config| # Do not overwrite migration if it's already set unless metadata.key?(:migration) - metadata[:migration] = true if metadata[:level] == :migration + metadata[:migration] = true if metadata[:level] == :migration || metadata[:level] == :background_migration end # Do not overwrite schema if it's already set unless metadata.key?(:schema) - metadata[:schema] = :latest if quality_level.background_migration?(location) + metadata[:schema] = :latest if metadata[:level] == :background_migration end # Do not overwrite type if it's already set |