Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 2 deletions

diff --git a/spec/initializers/active_record_locking_spec.rb b/spec/initializers/active_record_locking_spec.rb
index e979fa0b793..735ef7b916b 100644
--- a/spec/initializers/active_record_locking_spec.rb
+++ b/spec/initializers/active_record_locking_spec.rb
@@ -11,13 +11,13 @@ RSpec.describe 'ActiveRecord locking' do
     end
 
     it 'can be updated' do
-      issue.update(title: "New title")
+      issue.update!(title: "New title")
 
       expect(issue.reload.lock_version).to eq(new_lock_version)
     end
 
     it 'can be deleted' do
-      expect { issue.destroy }.to change { Issue.count }.by(-1)
+      expect { issue.destroy! }.to change { Issue.count }.by(-1)
     end
   end
 
diff --git a/spec/initializers/fog_google_https_private_urls_spec.rb b/spec/initializers/fog_google_https_private_urls_spec.rb
index 4825525a3d8..f7b21bf850e 100644
--- a/spec/initializers/fog_google_https_private_urls_spec.rb
+++ b/spec/initializers/fog_google_https_private_urls_spec.rb
@@ -13,11 +13,13 @@ RSpec.describe 'Fog::Storage::GoogleXML::File', :fog_requests do
   end
 
   let(:file) do
+    # rubocop:disable Rails/SaveBang
     directory = storage.directories.create(key: 'data')
     directory.files.create(
       body: 'Hello World!',
       key: 'hello_world.txt'
     )
+    # rubocop:enable Rails/SaveBang
   end
 
   it 'delegates to #get_https_url' do