Merge branch '296933-fix-webmock-disable' into 'master'

Reenable WebMock with correct settings

See merge request gitlab-org/gitlab!51194

spec/rack_servers/puma_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe 'Puma' do
   end
 
   after(:all) do
-    WebMock.disable_net_connect!(allow_localhost: true)
+    webmock_enable!
     Process.kill('TERM', @puma_master_pid)
   rescue Errno::ESRCH
   end

spec/rack_servers/unicorn_spec.rb

@@ -68,7 +68,7 @@ RSpec.describe 'Unicorn' do
   end
 
   after(:all) do
-    WebMock.disable_net_connect!(allow_localhost: true)
+    webmock_enable!
     Process.kill('TERM', @unicorn_master_pid)
   end
 

spec/views/admin/application_settings/general.html.haml_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe 'admin/application_settings/general.html.haml' do
   let(:app_settings) { build(:application_setting) }
   let(:user) { create(:admin) }
 
-  describe 'sourcegraph integration', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/296933' } do
+  describe 'sourcegraph integration' do
     let(:sourcegraph_flag) { true }
 
     before do