1 files changed, 12 insertions, 11 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 9c4baeae836..a41abd8c16d 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -77,7 +77,8 @@ RSpec.describe Projects::MergeRequestsController do
             merge_request,
             'json',
             diff_head: true,
-            view: 'inline'))
+            view: 'inline',
+            w: '0'))
       end
 
       context 'when diff files were cleaned' do
@@ -498,7 +499,7 @@ RSpec.describe Projects::MergeRequestsController do
       context 'when a squash commit message is passed' do
         let(:message) { 'My custom squash commit message' }
 
-        it 'passes the same message to SquashService', :sidekiq_might_not_need_inline do
+        it 'passes the same message to SquashService', :sidekiq_inline do
           params = { squash: '1',
                      squash_commit_message: message,
                      sha: merge_request.diff_head_sha }
@@ -790,7 +791,7 @@ RSpec.describe Projects::MergeRequestsController do
 
         context 'with private builds' do
           context 'for the target project member' do
-            it 'does not respond with serialized pipelines', :sidekiq_might_not_need_inline do
+            it 'does not respond with serialized pipelines' do
               expect(json_response['pipelines']).to be_empty
               expect(json_response['count']['all']).to eq(0)
               expect(response).to include_pagination_headers
@@ -800,7 +801,7 @@ RSpec.describe Projects::MergeRequestsController do
           context 'for the source project member' do
             let(:user) { fork_user }
 
-            it 'responds with serialized pipelines', :sidekiq_might_not_need_inline do
+            it 'responds with serialized pipelines' do
               expect(json_response['pipelines']).to be_present
               expect(json_response['count']['all']).to eq(1)
               expect(response).to include_pagination_headers
@@ -816,7 +817,7 @@ RSpec.describe Projects::MergeRequestsController do
           end
 
           context 'for the target project member' do
-            it 'does not respond with serialized pipelines', :sidekiq_might_not_need_inline do
+            it 'does not respond with serialized pipelines' do
               expect(json_response['pipelines']).to be_present
               expect(json_response['count']['all']).to eq(1)
               expect(response).to include_pagination_headers
@@ -826,7 +827,7 @@ RSpec.describe Projects::MergeRequestsController do
           context 'for the source project member' do
             let(:user) { fork_user }
 
-            it 'responds with serialized pipelines', :sidekiq_might_not_need_inline do
+            it 'responds with serialized pipelines' do
               expect(json_response['pipelines']).to be_present
               expect(json_response['count']['all']).to eq(1)
               expect(response).to include_pagination_headers
@@ -1855,13 +1856,13 @@ RSpec.describe Projects::MergeRequestsController do
         create(:merge_request, source_project: forked, target_project: project, target_branch: 'master', head_pipeline: pipeline)
       end
 
-      it 'links to the environment on that project', :sidekiq_might_not_need_inline do
+      it 'links to the environment on that project' do
         get_ci_environments_status
 
         expect(json_response.first['url']).to match(/#{forked.full_path}/)
       end
 
-      context "when environment_target is 'merge_commit'", :sidekiq_might_not_need_inline do
+      context "when environment_target is 'merge_commit'" do
         it 'returns nothing' do
           get_ci_environments_status(environment_target: 'merge_commit')
 
@@ -1891,13 +1892,13 @@ RSpec.describe Projects::MergeRequestsController do
 
       # we're trying to reduce the overall number of queries for this method.
       # set a hard limit for now. https://gitlab.com/gitlab-org/gitlab-foss/issues/52287
-      it 'keeps queries in check', :sidekiq_might_not_need_inline do
+      it 'keeps queries in check' do
         control_count = ActiveRecord::QueryRecorder.new { get_ci_environments_status }.count
 
         expect(control_count).to be <= 137
       end
 
-      it 'has no N+1 SQL issues for environments', :request_store, :sidekiq_might_not_need_inline, retry: 0 do
+      it 'has no N+1 SQL issues for environments', :request_store, retry: 0 do
         # First run to insert test data from lets, which does take up some 30 queries
         get_ci_environments_status
 
@@ -2144,7 +2145,7 @@ RSpec.describe Projects::MergeRequestsController do
           sign_in(fork_owner)
         end
 
-        it 'returns 200', :sidekiq_might_not_need_inline do
+        it 'returns 200' do
           expect_rebase_worker_for(fork_owner)
 
           post_rebase