Add latest changes from gitlab-org/gitlab@13-6-stable-ee

2 files changed, 12 insertions, 2 deletions

diff --git a/spec/services/packages/create_event_service_spec.rb b/spec/services/packages/create_event_service_spec.rb
index 55703e9127f..4db7687bb24 100644
--- a/spec/services/packages/create_event_service_spec.rb
+++ b/spec/services/packages/create_event_service_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe Packages::CreateEventService do
           stub_feature_flags(collect_package_events: false)
         end
 
-        it 'does not create an event object' do
+        it 'does not create an event' do
           expect { subject }.not_to change { Packages::Event.count }
         end
       end
@@ -43,6 +43,16 @@ RSpec.describe Packages::CreateEventService do
           expect(subject.event_scope).to eq(expected_scope)
           expect(subject.event_type).to eq(event_name)
         end
+
+        context 'on a read-only instance' do
+          before do
+            allow(Gitlab::Database).to receive(:read_only?).and_return(true)
+          end
+
+          it 'does not create an event' do
+            expect { subject }.not_to change { Packages::Event.count }
+          end
+        end
       end
     end
 
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index 3ae96d7a5ab..8e6147e7a3c 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Projects::TransferService do
   let_it_be(:group) { create(:group) }
   let(:project) { create(:project, :repository, :legacy_storage, namespace: user.namespace) }
 
-  subject(:execute_transfer) { described_class.new(project, user).execute(group) }
+  subject(:execute_transfer) { described_class.new(project, user).execute(group).tap { project.reload } }
 
   context 'with npm packages' do
     before do