Add latest changes from gitlab-org/gitlab@master

2 files changed, 20 insertions, 20 deletions

diff --git a/spec/services/merge_requests/create_from_issue_service_spec.rb b/spec/services/merge_requests/create_from_issue_service_spec.rb
index 749b30bff5f..0eefbed252b 100644
--- a/spec/services/merge_requests/create_from_issue_service_spec.rb
+++ b/spec/services/merge_requests/create_from_issue_service_spec.rb
@@ -34,19 +34,19 @@ RSpec.describe MergeRequests::CreateFromIssueService do
         expect(result[:message]).to eq('Invalid issue iid')
       end
 
-      it 'creates a branch based on issue title', :sidekiq_might_not_need_inline do
+      it 'creates a branch based on issue title' do
         service.execute
 
         expect(target_project.repository.branch_exists?(issue.to_branch_name)).to be_truthy
       end
 
-      it 'creates a branch using passed name', :sidekiq_might_not_need_inline do
+      it 'creates a branch using passed name' do
         service_with_custom_source_branch.execute
 
         expect(target_project.repository.branch_exists?(custom_source_branch)).to be_truthy
       end
 
-      it 'creates the new_merge_request system note', :sidekiq_might_not_need_inline do
+      it 'creates the new_merge_request system note' do
         expect(SystemNoteService).to receive(:new_merge_request).with(issue, project, user, instance_of(MergeRequest))
 
         service.execute
@@ -60,7 +60,7 @@ RSpec.describe MergeRequests::CreateFromIssueService do
         service.execute
       end
 
-      it 'creates the new_issue_branch system note when the branch could be created but the merge_request cannot be created', :sidekiq_might_not_need_inline do
+      it 'creates the new_issue_branch system note when the branch could be created but the merge_request cannot be created' do
         expect_next_instance_of(MergeRequest) do |instance|
           expect(instance).to receive(:valid?).at_least(:once).and_return(false)
         end
@@ -81,36 +81,36 @@ RSpec.describe MergeRequests::CreateFromIssueService do
         service.execute
       end
 
-      it 'creates a merge request', :sidekiq_might_not_need_inline do
+      it 'creates a merge request' do
         expect { service.execute }.to change(target_project.merge_requests, :count).by(1)
       end
 
-      it 'sets the merge request author to current user and assigns them', :sidekiq_might_not_need_inline do
+      it 'sets the merge request author to current user and assigns them' do
         result = service.execute
 
         expect(result[:merge_request].author).to eq(user)
         expect(result[:merge_request].assignees).to eq([user])
       end
 
-      it 'sets the merge request source branch to the new issue branch', :sidekiq_might_not_need_inline do
+      it 'sets the merge request source branch to the new issue branch' do
         result = service.execute
 
         expect(result[:merge_request].source_branch).to eq(issue.to_branch_name)
       end
 
-      it 'sets the merge request source branch to the passed branch name', :sidekiq_might_not_need_inline do
+      it 'sets the merge request source branch to the passed branch name' do
         result = service_with_custom_source_branch.execute
 
         expect(result[:merge_request].source_branch).to eq(custom_source_branch)
       end
 
-      it 'sets the merge request target branch to the project default branch', :sidekiq_might_not_need_inline do
+      it 'sets the merge request target branch to the project default branch' do
         result = service.execute
 
         expect(result[:merge_request].target_branch).to eq(target_project.default_branch)
       end
 
-      it 'executes quick actions if the build service sets them in the description', :sidekiq_might_not_need_inline do
+      it 'executes quick actions if the build service sets them in the description' do
         allow(service).to receive(:merge_request).and_wrap_original do |m, *args|
           m.call(*args).tap do |merge_request|
             merge_request.description = "/assign #{user.to_reference}"
@@ -122,7 +122,7 @@ RSpec.describe MergeRequests::CreateFromIssueService do
         expect(result[:merge_request].assignees).to eq([user])
       end
 
-      context 'when ref branch is set', :sidekiq_might_not_need_inline do
+      context 'when ref branch is set' do
         subject { described_class.new(project: project, current_user: user, mr_params: { ref: 'feature', **service_params }).execute }
 
         it 'sets the merge request source branch to the new issue branch' do
@@ -213,7 +213,7 @@ RSpec.describe MergeRequests::CreateFromIssueService do
 
         it_behaves_like 'a service that creates a merge request from an issue'
 
-        it 'sets the merge request title to: "Draft: $issue-branch-name', :sidekiq_might_not_need_inline do
+        it 'sets the merge request title to: "Draft: $issue-branch-name' do
           result = service.execute
 
           expect(result[:merge_request].title).to eq("Draft: #{issue.to_branch_name.titleize.humanize}")
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 02fe45e60db..5174ceaaa82 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -189,7 +189,7 @@ RSpec.describe MergeRequests::RefreshService do
 
       subject { service.new(project: @project, current_user: @user).execute(@oldrev, @newrev, 'refs/heads/master') }
 
-      it 'updates the head_pipeline_id for @merge_request', :sidekiq_might_not_need_inline do
+      it 'updates the head_pipeline_id for @merge_request', :sidekiq_inline do
         expect { subject }.to change { @merge_request.reload.head_pipeline_id }.from(nil).to(pipeline.id)
       end
 
@@ -306,7 +306,7 @@ RSpec.describe MergeRequests::RefreshService do
             subject
           end
 
-          it 'sets the latest detached merge request pipeline as a head pipeline', :sidekiq_might_not_need_inline do
+          it 'sets the latest detached merge request pipeline as a head pipeline' do
             @merge_request.reload
             expect(@merge_request.actual_head_pipeline).to be_merge_request_event
           end
@@ -424,7 +424,7 @@ RSpec.describe MergeRequests::RefreshService do
       end
     end
 
-    context 'push to origin repo target branch', :sidekiq_might_not_need_inline do
+    context 'push to origin repo target branch' do
       context 'when all MRs to the target branch had diffs' do
         before do
           service.new(project: @project, current_user: @user).execute(@oldrev, @newrev, 'refs/heads/feature')
@@ -474,7 +474,7 @@ RSpec.describe MergeRequests::RefreshService do
         end
       end
 
-      context 'manual merge of source branch', :sidekiq_might_not_need_inline do
+      context 'manual merge of source branch' do
         before do
           # Merge master -> feature branch
           @project.repository.merge(@user, @merge_request.diff_head_sha, @merge_request, 'Test message')
@@ -496,7 +496,7 @@ RSpec.describe MergeRequests::RefreshService do
       end
     end
 
-    context 'push to fork repo source branch', :sidekiq_might_not_need_inline do
+    context 'push to fork repo source branch' do
       let(:refresh_service) { service.new(project: @fork_project, current_user: @user) }
 
       def refresh
@@ -561,7 +561,7 @@ RSpec.describe MergeRequests::RefreshService do
       end
     end
 
-    context 'push to fork repo target branch', :sidekiq_might_not_need_inline do
+    context 'push to fork repo target branch' do
       describe 'changes to merge requests' do
         before do
           service.new(project: @fork_project, current_user: @user).execute(@oldrev, @newrev, 'refs/heads/feature')
@@ -587,7 +587,7 @@ RSpec.describe MergeRequests::RefreshService do
       end
     end
 
-    context 'forked projects with the same source branch name as target branch', :sidekiq_might_not_need_inline do
+    context 'forked projects with the same source branch name as target branch' do
       let!(:first_commit) do
         @fork_project.repository.create_file(@user, 'test1.txt', 'Test data',
                                              message: 'Test commit',
@@ -671,7 +671,7 @@ RSpec.describe MergeRequests::RefreshService do
     context 'push new branch that exists in a merge request' do
       let(:refresh_service) { service.new(project: @fork_project, current_user: @user) }
 
-      it 'refreshes the merge request', :sidekiq_might_not_need_inline do
+      it 'refreshes the merge request' do
         expect(refresh_service).to receive(:execute_hooks)
                                        .with(@fork_merge_request, 'update', old_rev: Gitlab::Git::BLANK_SHA)
         allow_any_instance_of(Repository).to receive(:merge_base).and_return(@oldrev)