Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/support_specs/database/prevent_cross_database_modification_spec.rb b/spec/support_specs/database/prevent_cross_database_modification_spec.rb
index 4fd55d59db0..5ea465356a1 100644
--- a/spec/support_specs/database/prevent_cross_database_modification_spec.rb
+++ b/spec/support_specs/database/prevent_cross_database_modification_spec.rb
@@ -66,7 +66,7 @@ RSpec.describe 'Database::PreventCrossDatabaseModification' do
             pipeline.touch
           end
         end
-      end.to raise_error /Cross-database data modification queries/
+      end.to raise_error /Cross-database data modification/
     end
   end
 
@@ -84,7 +84,7 @@ RSpec.describe 'Database::PreventCrossDatabaseModification' do
       context 'when data modification happens in a transaction' do
         it 'raises error' do
           Project.transaction do
-            expect { run_queries }.to raise_error /Cross-database data modification queries/
+            expect { run_queries }.to raise_error /Cross-database data modification/
           end
         end
 
@@ -93,7 +93,7 @@ RSpec.describe 'Database::PreventCrossDatabaseModification' do
             Project.transaction(requires_new: true) do
               project.touch
               Project.transaction(requires_new: true) do
-                expect { pipeline.touch }.to raise_error /Cross-database data modification queries/
+                expect { pipeline.touch }.to raise_error /Cross-database data modification/
               end
             end
           end
@@ -127,7 +127,7 @@ RSpec.describe 'Database::PreventCrossDatabaseModification' do
           ApplicationRecord.transaction do
             create(:ci_pipeline)
           end
-        end.to raise_error /Cross-database data modification queries/
+        end.to raise_error /Cross-database data modification/
       end
 
       it 'skips raising error on factory creation' do