Add latest changes from gitlab-org/gitlab@master

spec/services/ci/update_ci_ref_status_service_spec.rb

@@ -119,6 +119,14 @@ describe Ci::UpdateCiRefStatusService do
         it_behaves_like 'does a noop'
       end
+      context 'pipeline is retried' do
+        before do
+          ci_ref.update!(last_updated_by_pipeline: pipeline)
+        end
+
+        it_behaves_like 'updates ci_ref'
+      end
+
       context 'ref is stale' do
         let(:pipeline1) { create(:ci_pipeline, :success, project: ci_ref.project, ref: ci_ref.ref, tag: ci_ref.tag) }
         let(:pipeline2) { create(:ci_pipeline, :success, project: ci_ref.project, ref: ci_ref.ref, tag: ci_ref.tag) }

spec/services/projects/fork_service_spec.rb

@@ -312,6 +312,8 @@ describe Projects::ForkService do
       # Stub everything required to move a project to a Gitaly shard that does not exist
       stub_storage_settings('test_second_storage' => { 'path' => TestEnv::SECOND_STORAGE_PATH })
+      allow_any_instance_of(Gitlab::Git::Repository).to receive(:create_repository)
+        .and_return(true)
       allow_any_instance_of(Gitlab::Git::Repository).to receive(:replicate)
       allow_any_instance_of(Gitlab::Git::Repository).to receive(:checksum)
         .and_return(::Gitlab::Git::BLANK_SHA)

spec/services/projects/update_repository_storage_service_spec.rb

@@ -32,6 +32,8 @@ describe Projects::UpdateRepositoryStorageService do
             project.repository.path_to_repo
           end
+          expect(project_repository_double).to receive(:create_repository)
+            .and_return(true)
           expect(project_repository_double).to receive(:replicate)
             .with(project.repository.raw)
           expect(project_repository_double).to receive(:checksum)
@@ -58,6 +60,8 @@ describe Projects::UpdateRepositoryStorageService do
       context 'when the move fails' do
         it 'unmarks the repository as read-only without updating the repository storage' do
+          expect(project_repository_double).to receive(:create_repository)
+            .and_return(true)
           expect(project_repository_double).to receive(:replicate)
             .with(project.repository.raw)
             .and_raise(Gitlab::Git::CommandError)
@@ -73,6 +77,8 @@ describe Projects::UpdateRepositoryStorageService do
       context 'when the checksum does not match' do
         it 'unmarks the repository as read-only without updating the repository storage' do
+          expect(project_repository_double).to receive(:create_repository)
+            .and_return(true)
           expect(project_repository_double).to receive(:replicate)
             .with(project.repository.raw)
           expect(project_repository_double).to receive(:checksum)
@@ -91,6 +97,8 @@ describe Projects::UpdateRepositoryStorageService do
         let!(:pool) { create(:pool_repository, :ready, source_project: project) }
         it 'leaves the pool' do
+          expect(project_repository_double).to receive(:create_repository)
+            .and_return(true)
           expect(project_repository_double).to receive(:replicate)
             .with(project.repository.raw)
           expect(project_repository_double).to receive(:checksum)

spec/services/releases/update_service_spec.rb

@@ -44,12 +44,6 @@ describe Releases::UpdateService do
       it_behaves_like 'a failed update'
     end
-    context 'with an invalid update' do
-      let(:new_description) { '' }
-
-      it_behaves_like 'a failed update'
-    end
-
     context 'when a milestone is passed in' do
       let(:milestone) { create(:milestone, project: project, title: 'v1.0') }
       let(:params_with_milestone) { params.merge!({ milestones: [new_title] }) }

spec/support/shared_examples/services/projects/update_repository_storage_service_shared_examples.rb

@@ -22,11 +22,15 @@ RSpec.shared_examples 'moves repository to another storage' do |repository_type|
   context 'when the move succeeds', :clean_gitlab_redis_shared_state do
     before do
+      allow(project_repository_double).to receive(:create_repository)
+        .and_return(true)
       allow(project_repository_double).to receive(:replicate)
         .with(project.repository.raw)
       allow(project_repository_double).to receive(:checksum)
         .and_return(project_repository_checksum)
+      allow(repository_double).to receive(:create_repository)
+        .and_return(true)
       allow(repository_double).to receive(:replicate)
         .with(repository.raw)
       allow(repository_double).to receive(:checksum)
@@ -90,11 +94,15 @@ RSpec.shared_examples 'moves repository to another storage' do |repository_type|
   context "when the move of the #{repository_type} repository fails" do
     it 'unmarks the repository as read-only without updating the repository storage' do
+      allow(project_repository_double).to receive(:create_repository)
+        .and_return(true)
       allow(project_repository_double).to receive(:replicate)
         .with(project.repository.raw)
       allow(project_repository_double).to receive(:checksum)
         .and_return(project_repository_checksum)
+      allow(repository_double).to receive(:create_repository)
+        .and_return(true)
       allow(repository_double).to receive(:replicate)
         .with(repository.raw)
         .and_raise(Gitlab::Git::CommandError)
@@ -111,11 +119,15 @@ RSpec.shared_examples 'moves repository to another storage' do |repository_type|
   context "when the checksum of the #{repository_type} repository does not match" do
     it 'unmarks the repository as read-only without updating the repository storage' do
+      allow(project_repository_double).to receive(:create_repository)
+        .and_return(true)
       allow(project_repository_double).to receive(:replicate)
         .with(project.repository.raw)
       allow(project_repository_double).to receive(:checksum)
         .and_return(project_repository_checksum)
+      allow(repository_double).to receive(:create_repository)
+        .and_return(true)
       allow(repository_double).to receive(:replicate)
         .with(repository.raw)
       allow(repository_double).to receive(:checksum)

yarn.lock

@@ -7766,10 +7766,10 @@ merge2@^1.2.3:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
   integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
-mermaid@^8.4.5:
-  version "8.4.5"
-  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.5.tgz#48d5722cbc72be2ad01002795835d7ca1b48e000"
-  integrity sha512-oJWgZBtT2rvAdmqHvKjDwb3tOut1+ksfgDdZrVhhNcdzNibzGPjCsmMPpVXjkFYzKZCVunIbAkfxltSuaGIhaw==
+mermaid@^8.4.8:
+  version "8.4.8"
+  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.8.tgz#8adcfdbc505d6bca52df167cff690427c9727b60"
+  integrity sha512-sumTNBFwMX7oMQgogdr3NhgTeQOiwcEsm23rQ4KHGW7tpmvMwER1S+1gjCSSnqlmM/zw7Ga7oesYCYicKboRwQ==
   dependencies:
     "@braintree/sanitize-url" "^3.1.0"
     crypto-random-string "^3.0.1"