summaryrefslogtreecommitdiff
path: root/spec/services/submit_usage_ping_service_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 18:09:00 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 18:09:00 +0000
commiteb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d (patch)
treed572a6d931152ae0dd10427237f5811893438552 /spec/services/submit_usage_ping_service_spec.rb
parentb304a72312465ed4c0a568ee6a6ea5e97f705c9b (diff)
downloadgitlab-ce-eb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/submit_usage_ping_service_spec.rb')
-rw-r--r--spec/services/submit_usage_ping_service_spec.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/services/submit_usage_ping_service_spec.rb b/spec/services/submit_usage_ping_service_spec.rb
index e2f1ef089bf..26ce5968ad6 100644
--- a/spec/services/submit_usage_ping_service_spec.rb
+++ b/spec/services/submit_usage_ping_service_spec.rb
@@ -76,6 +76,7 @@ describe SubmitUsagePingService do
context 'when usage ping is enabled' do
before do
+ allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false)
stub_application_setting(usage_ping_enabled: true)
end