......@@ -12,3 +12,5 @@ module API
end
end
end
API::Entities::Board.prepend_if_ee('EE::API::Entities::Board')
......@@ -34,3 +34,5 @@ module API
end
end
end
API::Entities::Group.prepend_if_ee('EE::API::Entities::Group', with_descendants: true)
......@@ -34,3 +34,5 @@ module API
end
end
end
API::Entities::GroupDetail.prepend_if_ee('EE::API::Entities::GroupDetail')
......@@ -7,3 +7,5 @@ module API
end
end
end
API::Entities::Identity.prepend_if_ee('EE::API::Entities::Identity')
......@@ -46,3 +46,5 @@ module API
end
end
end
API::Entities::Issue.prepend_if_ee('EE::API::Entities::Issue')
......@@ -41,3 +41,5 @@ module API
end
end
end
API::Entities::IssueBasic.prepend_if_ee('EE::API::Entities::IssueBasic', with_descendants: true)
......@@ -9,3 +9,5 @@ module API
end
end
end
API::Entities::List.prepend_if_ee('EE::API::Entities::List')
......@@ -9,3 +9,5 @@ module API
end
end
end
API::Entities::Member.prepend_if_ee('EE::API::Entities::Member', with_descendants: true)
......@@ -92,3 +92,5 @@ module API
end
end
end
API::Entities::MergeRequestBasic.prepend_if_ee('EE::API::Entities::MergeRequestBasic', with_descendants: true)
......@@ -13,3 +13,5 @@ module API
end
end
end
API::Entities::Namespace.prepend_if_ee('EE::API::Entities::Namespace')
......@@ -131,21 +131,4 @@ module API
end
end
# rubocop: disable Cop/InjectEnterpriseEditionModule
::API::Entities::ApplicationSetting.prepend_if_ee('EE::API::Entities::ApplicationSetting')
::API::Entities::Board.prepend_if_ee('EE::API::Entities::Board')
::API::Entities::Group.prepend_if_ee('EE::API::Entities::Group', with_descendants: true)
::API::Entities::GroupDetail.prepend_if_ee('EE::API::Entities::GroupDetail')
::API::Entities::IssueBasic.prepend_if_ee('EE::API::Entities::IssueBasic', with_descendants: true)
::API::Entities::Issue.prepend_if_ee('EE::API::Entities::Issue')
::API::Entities::List.prepend_if_ee('EE::API::Entities::List')
::API::Entities::MergeRequestBasic.prepend_if_ee('EE::API::Entities::MergeRequestBasic', with_descendants: true)
::API::Entities::Member.prepend_if_ee('EE::API::Entities::Member', with_descendants: true)
::API::Entities::Namespace.prepend_if_ee('EE::API::Entities::Namespace')
::API::Entities::Project.prepend_if_ee('EE::API::Entities::Project', with_descendants: true)
::API::Entities::ProtectedRefAccess.prepend_if_ee('EE::API::Entities::ProtectedRefAccess')
::API::Entities::UserPublic.prepend_if_ee('EE::API::Entities::UserPublic', with_descendants: true)
::API::Entities::Todo.prepend_if_ee('EE::API::Entities::Todo')
::API::Entities::ProtectedBranch.prepend_if_ee('EE::API::Entities::ProtectedBranch')
::API::Entities::Identity.prepend_if_ee('EE::API::Entities::Identity')
::API::Entities::UserWithAdmin.prepend_if_ee('EE::API::Entities::UserWithAdmin', with_descendants: true)
API::Entities::Project.prepend_if_ee('EE::API::Entities::Project', with_descendants: true)
......@@ -10,3 +10,5 @@ module API
end
end
end
API::Entities::ProtectedBranch.prepend_if_ee('EE::API::Entities::ProtectedBranch')
......@@ -10,3 +10,5 @@ module API
end
end
end
API::Entities::ProtectedRefAccess.prepend_if_ee('EE::API::Entities::ProtectedRefAccess')
......@@ -44,3 +44,5 @@ module API
end
end
end
API::Entities::Todo.prepend_if_ee('EE::API::Entities::Todo')
......@@ -17,3 +17,5 @@ module API
end
end
end
API::Entities::UserPublic.prepend_if_ee('EE::API::Entities::UserPublic', with_descendants: true)
......@@ -7,3 +7,5 @@ module API
end
end
end
API::Entities::UserWithAdmin.prepend_if_ee('EE::API::Entities::UserWithAdmin', with_descendants: true)
......@@ -50,10 +50,7 @@ module Gitlab
status = ::Gitlab::Ci::Reports::TestCase::STATUS_FAILED
system_output = data['failure']
elsif data['error']
# For now, as an MVC, we are grouping error test cases together
# with failed ones. But we will improve this further on
# https://gitlab.com/gitlab-org/gitlab/issues/32046.
status = ::Gitlab::Ci::Reports::TestCase::STATUS_FAILED
status = ::Gitlab::Ci::Reports::TestCase::STATUS_ERROR
system_output = data['error']
else
status = ::Gitlab::Ci::Reports::TestCase::STATUS_SUCCESS
......
......
......@@ -29,7 +29,7 @@ module Gitlab
end
end
%w(total_count resolved_count failed_count).each do |method|
%w(total_count resolved_count failed_count error_count).each do |method|
define_method(method) do
# rubocop: disable CodeReuse/ActiveRecord
suite_comparers.sum { |suite| suite.public_send(method) } # rubocop:disable GitlabSecurity/PublicSend
......
......
......@@ -38,6 +38,30 @@ module Gitlab
end
end
def new_errors
strong_memoize(:new_errors) do
head_suite.error.reject do |key, _|
base_suite.error.include?(key)
end.values
end
end
def existing_errors
strong_memoize(:existing_errors) do
head_suite.error.select do |key, _|
base_suite.error.include?(key)
end.values
end
end
def resolved_errors
strong_memoize(:resolved_errors) do
head_suite.success.select do |key, _|
base_suite.error.include?(key)
end.values
end
end
def total_count
head_suite.total_count
end
......@@ -47,12 +71,16 @@ module Gitlab
end
def resolved_count
resolved_failures.count
resolved_failures.count + resolved_errors.count
end
def failed_count
new_failures.count + existing_failures.count
end
def error_count
new_errors.count + existing_errors.count
end
end
end
end
......
......
......@@ -27,7 +27,7 @@ license_scanning:
refs:
- branches
variables:
- $GITLAB_FEATURES =~ /\blicense_management\b/
- $GITLAB_FEATURES =~ /\blicense_scanning\b/
except:
variables:
- $LICENSE_MANAGEMENT_DISABLED