Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-07-05 18:01:25 +0300
committerSean McGivern <sean@mcgivern.me.uk>2018-07-05 18:01:25 +0300
commit8488a39cbcf946679fcf4523443625384a667611 (patch)
tree7b67a83a01fcbc766effcb604f5d033630c060bd /spec/controllers
parentdc478a8243221dff79058a88040a520296b9fe1d (diff)
parentb7b3a059f9799e11f2f8c2ebe77cc32ca6c5ea39 (diff)
Merge branch 'port-c32af9da-to-ce' into 'master'
Allow 2 more queries in spec/controllers/projects/pipelines_controller_spec.rb See merge request gitlab-org/gitlab-ce!20407
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/pipelines_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb
index 1cc7f33b57a..290fcd4f8e6 100644
--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -74,7 +74,7 @@ describe Projects::PipelinesController do
expect(stages.count).to eq 3
end
- expect(queries.count).to be_within(3).of(30)
+ expect(queries.count).to be_within(5).of(30)
end
end