Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 446c1c59030..5bb7853a154 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -16,7 +16,7 @@ FactoryBot.define do
 
     options do
       {
-        image: 'ruby:2.1',
+        image: 'ruby:2.7',
         services: ['postgres'],
         script: ['ls -a']
       }
@@ -336,7 +336,7 @@ FactoryBot.define do
     trait :extended_options do
       options do
         {
-          image: { name: 'ruby:2.1', entrypoint: '/bin/sh' },
+          image: { name: 'ruby:2.7', entrypoint: '/bin/sh' },
           services: ['postgres', { name: 'docker:stable-dind', entrypoint: '/bin/sh', command: 'sleep 30', alias: 'docker' }],
           script: %w(echo),
           after_script: %w(ls date),
diff --git a/spec/factories/snippets.rb b/spec/factories/snippets.rb
index 3d99a04ea1a..21e1d911f96 100644
--- a/spec/factories/snippets.rb
+++ b/spec/factories/snippets.rb
@@ -28,7 +28,7 @@ FactoryBot.define do
           bare_repo: TestEnv.factory_repo_path_bare,
           refs: TestEnv::BRANCH_SHA)
 
-        snippet.track_snippet_repository
+        snippet.track_snippet_repository(snippet.repository.storage)
       end
     end