Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 7 deletions

diff --git a/spec/services/issues/close_service_spec.rb b/spec/services/issues/close_service_spec.rb
index 1f7d564b6ec..dce62d1d20e 100644
--- a/spec/services/issues/close_service_spec.rb
+++ b/spec/services/issues/close_service_spec.rb
@@ -70,7 +70,7 @@ describe Issues::CloseService do
   end
 
   describe '#close_issue' do
-    context "closed by a merge request" do
+    context "closed by a merge request", :sidekiq_might_not_need_inline do
       it 'mentions closure via a merge request' do
         perform_enqueued_jobs do
           described_class.new(project, user).close_issue(issue, closed_via: closing_merge_request)
@@ -100,7 +100,7 @@ describe Issues::CloseService do
       end
     end
 
-    context "closed by a commit" do
+    context "closed by a commit", :sidekiq_might_not_need_inline do
       it 'mentions closure via a commit' do
         perform_enqueued_jobs do
           described_class.new(project, user).close_issue(issue, closed_via: closing_commit)
@@ -146,7 +146,7 @@ describe Issues::CloseService do
         expect(issue.closed_by_id).to be(user.id)
       end
 
-      it 'sends email to user2 about assign of new issue' do
+      it 'sends email to user2 about assign of new issue', :sidekiq_might_not_need_inline do
         email = ActionMailer::Base.deliveries.last
         expect(email.to.first).to eq(user2.email)
         expect(email.subject).to include(issue.title)
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 154bfec0da2..1eec3b97ea1 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -169,7 +169,7 @@ describe Issues::UpdateService, :mailer do
         end
       end
 
-      context 'with background jobs processed' do
+      context 'with background jobs processed', :sidekiq_might_not_need_inline do
         before do
           perform_enqueued_jobs do
             update_issue(opts)
@@ -366,7 +366,7 @@ describe Issues::UpdateService, :mailer do
 
         it_behaves_like 'system notes for milestones'
 
-        it 'sends notifications for subscribers of changed milestone' do
+        it 'sends notifications for subscribers of changed milestone', :sidekiq_might_not_need_inline do
           issue.milestone = create(:milestone, project: project)
 
           issue.save
@@ -398,7 +398,7 @@ describe Issues::UpdateService, :mailer do
 
         it_behaves_like 'system notes for milestones'
 
-        it 'sends notifications for subscribers of changed milestone' do
+        it 'sends notifications for subscribers of changed milestone', :sidekiq_might_not_need_inline do
           perform_enqueued_jobs do
             update_issue(milestone: create(:milestone, project: project))
           end
@@ -435,7 +435,7 @@ describe Issues::UpdateService, :mailer do
         end
       end
 
-      it 'sends notifications for subscribers of newly added labels' do
+      it 'sends notifications for subscribers of newly added labels', :sidekiq_might_not_need_inline do
         opts = { label_ids: [label.id] }
 
         perform_enqueued_jobs do