diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-07-26 13:23:04 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-07-26 13:23:04 +0000 |
| commit | 995d8e6c5e52afc294573e016f86f2a429b85d8e (patch) | |
| tree | 28e8ce2609045a73cf54880da261c04d8c322ff5 /spec/controllers/projects | |
| parent | 6d830eaea38ba3b917ecad40e630afe2c0ec36c5 (diff) | |
| parent | 41f87e9e99e14f7d591f222b0246467acd040625 (diff) | |
| download | gitlab-ce-995d8e6c5e52afc294573e016f86f2a429b85d8e.tar.gz | |
Merge branch 'remove_deployment_metrics_deployment_platform_fallback' into 'master'
Remove fallback to deployment_platform_cluster in `DeploymentMetrics`
See merge request gitlab-org/gitlab-ce!31126
Diffstat (limited to 'spec/controllers/projects')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index f11880122b1..fa71d9b61b1 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -885,10 +885,9 @@ describe Projects::MergeRequestsController do environment2 = create(:environment, project: forked) create(:deployment, :succeed, environment: environment2, sha: sha, ref: 'master', deployable: build) - # TODO address the last 11 queries + # TODO address the last 5 queries # See https://gitlab.com/gitlab-org/gitlab-ce/issues/63952 (5 queries) - # And https://gitlab.com/gitlab-org/gitlab-ce/issues/64105 (6 queries) - leeway = 11 + leeway = 5 expect { get_ci_environments_status }.not_to exceed_all_query_limit(control_count + leeway) end end |