Merge branch 'sh-disable-merge-worker-in-spec' into 'master'

Disable Sidekiq in merge immediately spec to prevent transient build failures

See merge request !11422

Former-commit-id: a14d75ff

spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb

@@ -34,11 +34,13 @@ feature 'Merge immediately', :feature, :js do
       page.within '.mr-widget-body' do
         find('.dropdown-toggle').click
-        click_link 'Merge immediately'
-        expect(find('.accept-merge-request.btn-info')).to have_content('Merge in progress')
-        wait_for_ajax
+        Sidekiq::Testing.fake! do
+          click_link 'Merge immediately'
+          expect(find('.accept-merge-request.btn-info')).to have_content('Merge in progress')
+          wait_for_vue_resource
+        end
       end
     end
   end