summaryrefslogtreecommitdiff
path: root/spec/models/project_services
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-23 09:06:03 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-23 09:06:03 +0000
commitb3e4ec8e8adf4fe96c982124e91b6a05021a9cda (patch)
tree5fda0011a7cc7de000186e465e61f893d478a1c8 /spec/models/project_services
parent90cdc9391171e1be29b2b57a2e2aad0c02c2a7a9 (diff)
downloadgitlab-ce-b3e4ec8e8adf4fe96c982124e91b6a05021a9cda.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/project_services')
-rw-r--r--spec/models/project_services/irker_service_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/project_services/irker_service_spec.rb b/spec/models/project_services/irker_service_spec.rb
index 2e1f6964692..309dc51191b 100644
--- a/spec/models/project_services/irker_service_spec.rb
+++ b/spec/models/project_services/irker_service_spec.rb
@@ -60,7 +60,7 @@ describe IrkerService do
@irker_server.close
end
- it 'sends valid JSON messages to an Irker listener' do
+ it 'sends valid JSON messages to an Irker listener', :sidekiq_might_not_need_inline do
irker.execute(sample_data)
conn = @irker_server.accept