diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0300 |
commit | 154b9bae142ba15fec753f44327654595094b879 (patch) | |
tree | 027f8ae024961778d5b00c77a72fe302f985d4f3 /spec/spec_helper.rb | |
parent | 2c156e3c7bbade01c36eee18327f1ced6eebea79 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3f6503a60a9..30524e4bbae 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -81,6 +81,11 @@ RSpec.configure do |config| metadata[:migration] = true if metadata[:level] == :migration end + # Do not overwrite schema if it's already set + unless metadata.key?(:schema) + metadata[:schema] = :latest if quality_level.background_migration?(location) + end + # Do not overwrite type if it's already set unless metadata.key?(:type) match = location.match(%r{/spec/([^/]+)/}) |