summaryrefslogtreecommitdiff
path: root/db/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-20 11:10:13 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-20 11:10:13 +0000
commit0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch)
tree7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /db/fixtures
parent72123183a20411a36d607d70b12d57c484394c8e (diff)
downloadgitlab-ce-0ea3fcec397b69815975647f5e2aa5fe944a8486.tar.gz
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'db/fixtures')
-rw-r--r--db/fixtures/development/04_labels.rb2
-rw-r--r--db/fixtures/development/12_snippets.rb3
2 files changed, 2 insertions, 3 deletions
diff --git a/db/fixtures/development/04_labels.rb b/db/fixtures/development/04_labels.rb
index 5f0d7f2d8be..0a09e8684e3 100644
--- a/db/fixtures/development/04_labels.rb
+++ b/db/fixtures/development/04_labels.rb
@@ -1,7 +1,5 @@
# frozen_string_literal: true
-require 'digest/md5'
-
class Gitlab::Seeder::GroupLabels
def initialize(group, label_per_group: 10)
@group = group
diff --git a/db/fixtures/development/12_snippets.rb b/db/fixtures/development/12_snippets.rb
index 6d31007b320..24500aa3e7d 100644
--- a/db/fixtures/development/12_snippets.rb
+++ b/db/fixtures/development/12_snippets.rb
@@ -35,6 +35,8 @@ Gitlab::Seeder.quiet do
visibility_level: Gitlab::VisibilityLevel.values.sample,
content: 'foo'
}).tap do |snippet|
+ snippet.repository.expire_exists_cache
+
unless snippet.repository_exists?
Gitlab::Seeder::SnippetRepository.new(snippet).import
end
@@ -48,4 +50,3 @@ Gitlab::Seeder.quiet do
Gitlab::Seeder::SnippetRepository.cleanup
end
-