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:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-07 15:09:46 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-07 15:09:46 +0300
commit896b68514b43b9646d763e67f63fbe8f9ef2f723 (patch)
treeb0b21f37cbbc809782532e6d6180677c7c4c9e30 /app/serializers
parentd8803c7e40bd35d883ef007ddc56907bd837a748 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/test_suite_comparer_entity.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/serializers/test_suite_comparer_entity.rb b/app/serializers/test_suite_comparer_entity.rb
index 78c243f75b8..a9f19564b60 100644
--- a/app/serializers/test_suite_comparer_entity.rb
+++ b/app/serializers/test_suite_comparer_entity.rb
@@ -46,8 +46,6 @@ class TestSuiteComparerEntity < Grape::Entity
private
def max_tests(*used)
- return Integer::MAX unless Feature.enabled?(:ci_limit_test_reports_size, default_enabled: true)
-
[DEFAULT_MAX_TESTS - used.map(&:count).sum, DEFAULT_MIN_TESTS].max
end
# rubocop: enable CodeReuse/ActiveRecord