Automatic merge of gitlab-org/gitlab master

lib/gitlab/artifacts/migration_helper.rb

-# frozen_string_literal: true
-
-module Gitlab
-  module Artifacts
-    class MigrationHelper
-      def migrate_to_remote_storage(&block)
-        artifacts = ::Ci::JobArtifact.with_files_stored_locally
-        migrate(artifacts, ObjectStorage::Store::REMOTE, &block)
-      end
-
-      def migrate_to_local_storage(&block)
-        artifacts = ::Ci::JobArtifact.with_files_stored_remotely
-        migrate(artifacts, ObjectStorage::Store::LOCAL, &block)
-      end
-
-      private
-
-      def batch_size
-        ENV.fetch('MIGRATION_BATCH_SIZE', 10).to_i
-      end
-
-      def migrate(artifacts, store, &block)
-        artifacts.find_each(batch_size: batch_size) do |artifact| # rubocop:disable CodeReuse/ActiveRecord
-          artifact.file.migrate!(store)
-
-          yield artifact if block
-        rescue StandardError => e
-          raise StandardError.new("Failed to transfer artifact of type #{artifact.file_type} and ID #{artifact.id} with error: #{e.message}")
-        end
-      end
-    end
-  end
-end

lib/gitlab/ci/artifacts/migration_helper.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module Ci
+    module Artifacts
+      class MigrationHelper
+        def migrate_to_remote_storage(&block)
+          artifacts = ::Ci::JobArtifact.with_files_stored_locally
+          migrate(artifacts, ObjectStorage::Store::REMOTE, &block)
+        end
+
+        def migrate_to_local_storage(&block)
+          artifacts = ::Ci::JobArtifact.with_files_stored_remotely
+          migrate(artifacts, ObjectStorage::Store::LOCAL, &block)
+        end
+
+        private
+
+        def batch_size
+          ENV.fetch('MIGRATION_BATCH_SIZE', 10).to_i
+        end
+
+        def migrate(artifacts, store, &block)
+          artifacts.find_each(batch_size: batch_size) do |artifact| # rubocop:disable CodeReuse/ActiveRecord
+            artifact.file.migrate!(store)
+
+            yield artifact if block
+          rescue StandardError => e
+            raise StandardError.new("Failed to transfer artifact of type #{artifact.file_type} and ID #{artifact.id} with error: #{e.message}")
+          end
+        end
+      end
+    end
+  end
+end

lib/tasks/gitlab/artifacts/migrate.rake

@@ -10,7 +10,7 @@ namespace :gitlab do
       logger = Logger.new(STDOUT)
       logger.info('Starting transfer of artifacts to remote storage')
 
-      helper = Gitlab::Artifacts::MigrationHelper.new
+      helper = Gitlab::Ci::Artifacts::MigrationHelper.new
 
       begin
         helper.migrate_to_remote_storage do |artifact|
@@ -25,7 +25,7 @@ namespace :gitlab do
       logger = Logger.new(STDOUT)
       logger.info('Starting transfer of artifacts to local storage')
 
-      helper = Gitlab::Artifacts::MigrationHelper.new
+      helper = Gitlab::Ci::Artifacts::MigrationHelper.new
 
       begin
         helper.migrate_to_local_storage do |artifact|

spec/frontend/branches/components/__snapshots__/divergence_graph_spec.js.snap

@@ -3,7 +3,7 @@
 exports[`Branch divergence graph component renders ahead and behind count 1`] = `
 <div
   class="divergence-graph px-2 d-none d-md-block"
-  title="10 commits behind master, 10 commits ahead"
+  title="10 commits behind main, 10 commits ahead"
 >
   <graph-bar-stub
     count="10"
@@ -26,7 +26,7 @@ exports[`Branch divergence graph component renders ahead and behind count 1`] =
 exports[`Branch divergence graph component renders distance count 1`] = `
 <div
   class="divergence-graph px-2 d-none d-md-block"
-  title="More than 900 commits different with master"
+  title="More than 900 commits different with main"
 >
   <graph-bar-stub
     count="900"

spec/frontend/branches/components/divergence_graph_spec.js

@@ -15,7 +15,7 @@ describe('Branch divergence graph component', () => {
 
   it('renders ahead and behind count', () => {
     factory({
-      defaultBranch: 'master',
+      defaultBranch: 'main',
       aheadCount: 10,
       behindCount: 10,
       maxCommits: 100,
@@ -27,18 +27,18 @@ describe('Branch divergence graph component', () => {
 
   it('sets title for ahead and behind count', () => {
     factory({
-      defaultBranch: 'master',
+      defaultBranch: 'main',
       aheadCount: 10,
       behindCount: 10,
       maxCommits: 100,
     });
 
-    expect(vm.attributes('title')).toBe('10 commits behind master, 10 commits ahead');
+    expect(vm.attributes('title')).toBe('10 commits behind main, 10 commits ahead');
   });
 
   it('renders distance count', () => {
     factory({
-      defaultBranch: 'master',
+      defaultBranch: 'main',
       aheadCount: 0,
       behindCount: 0,
       distance: 900,
@@ -55,13 +55,13 @@ describe('Branch divergence graph component', () => {
     ${1100}  | ${'999+'}
   `('sets title for $distance as $titleText', ({ distance, titleText }) => {
     factory({
-      defaultBranch: 'master',
+      defaultBranch: 'main',
       aheadCount: 0,
       behindCount: 0,
       distance,
       maxCommits: 100,
     });
 
-    expect(vm.attributes('title')).toBe(`More than ${titleText} commits different with master`);
+    expect(vm.attributes('title')).toBe(`More than ${titleText} commits different with main`);
   });
 });

spec/frontend/branches/divergence_graph_spec.js

@@ -9,14 +9,14 @@ describe('Divergence graph', () => {
     mock = new MockAdapter(axios);
 
     mock.onGet('/-/diverging_counts').reply(200, {
-      master: { ahead: 1, behind: 1 },
+      main: { ahead: 1, behind: 1 },
       'test/hello-world': { ahead: 1, behind: 1 },
     });
 
     jest.spyOn(axios, 'get');
 
     document.body.innerHTML = `
-      <div class="js-branch-item" data-name="master"><div class="js-branch-divergence-graph"></div></div>
+      <div class="js-branch-item" data-name="main"><div class="js-branch-divergence-graph"></div></div>
       <div class="js-branch-item" data-name="test/hello-world"><div class="js-branch-divergence-graph"></div></div>
     `;
   });
@@ -28,7 +28,7 @@ describe('Divergence graph', () => {
   it('calls axios get with list of branch names', () =>
     init('/-/diverging_counts').then(() => {
       expect(axios.get).toHaveBeenCalledWith('/-/diverging_counts', {
-        params: { names: ['master', 'test/hello-world'] },
+        params: { names: ['main', 'test/hello-world'] },
       });
     }));
 
@@ -46,7 +46,7 @@ describe('Divergence graph', () => {
 
   it('creates Vue components', () =>
     init('/-/diverging_counts').then(() => {
-      expect(document.querySelector('[data-name="master"]').innerHTML).not.toEqual('');
+      expect(document.querySelector('[data-name="main"]').innerHTML).not.toEqual('');
       expect(document.querySelector('[data-name="test/hello-world"]').innerHTML).not.toEqual('');
     }));
 });