summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicaël Bergeron <mbergeron@gitlab.com>2018-03-22 09:07:59 -0400
committerMicaël Bergeron <mbergeron@gitlab.com>2018-03-22 09:07:59 -0400
commit9a334b29e022ab8fed868e3b2d8a57b258589930 (patch)
tree34e16553e46a2f8cf9c984c21dce21a22c2afac2
parent9c6663ea079128bb730ec2a168b43961cd9462ec (diff)
parent511cf9345f2b95dd6b8c0aa26450ae8458637d2f (diff)
downloadgitlab-ce-9a334b29e022ab8fed868e3b2d8a57b258589930.tar.gz
Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into 40781-os-to-ce
-rw-r--r--spec/serializers/pipeline_serializer_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb
index 14c9f5cb58c..f51c11b141f 100644
--- a/spec/serializers/pipeline_serializer_spec.rb
+++ b/spec/serializers/pipeline_serializer_spec.rb
@@ -118,7 +118,7 @@ describe PipelineSerializer do
it 'verifies number of queries', :request_store do
recorded = ActiveRecord::QueryRecorder.new { subject }
- expect(recorded.count).to be_within(1).of(40)
+ expect(recorded.count).to be_within(1).of(36)
expect(recorded.cached_count).to eq(0)
end
end