summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2019-07-08 09:36:22 +1200
committerThong Kuah <tkuah@gitlab.com>2019-07-08 21:43:35 +1200
commit56c129293578cb620daf1c19b1bc61cd18d9fa83 (patch)
tree7e9299e53709a62be42f41483d2091f75128ad98
parent792455450a1934181369412bc5ba4082c832ed86 (diff)
downloadgitlab-ce-56c129293578cb620daf1c19b1bc61cd18d9fa83.tar.gz
Add retry:0 for controller specs n+163475-fix-n-1
As a workaround for https://gitlab.com/gitlab-org/gitlab-ce/issues/64116
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 2a6736018ea..9878f88a395 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -878,7 +878,7 @@ describe Projects::MergeRequestsController do
expect(control_count).to be <= 137
end
- it 'has no N+1 issues for environments', :request_store do
+ it 'has no N+1 issues for environments', :request_store, retry: 0 do
# First run to insert test data from lets, which does take up some 30 queries
get_ci_environments_status