diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-28 15:09:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-28 15:09:44 +0300 |
commit | c74b7b5e4345702a1d59c72d923c3580ef157a59 (patch) | |
tree | 0d6cc261341fa36babe44e497dc26153da611b7b /lib/gitlab/checks | |
parent | 0f59ad0c29c8679957c716317c842f606177f223 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/checks')
-rw-r--r-- | lib/gitlab/checks/base_checker.rb | 3 | ||||
-rw-r--r-- | lib/gitlab/checks/change_access.rb | 4 | ||||
-rw-r--r-- | lib/gitlab/checks/diff_check.rb | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/gitlab/checks/base_checker.rb b/lib/gitlab/checks/base_checker.rb index a14fa02c2a4..0045d8a4113 100644 --- a/lib/gitlab/checks/base_checker.rb +++ b/lib/gitlab/checks/base_checker.rb @@ -3,7 +3,6 @@ module Gitlab module Checks class BaseChecker - prepend_if_ee('EE::Gitlab::Checks::BaseChecker') # rubocop: disable Cop/InjectEnterpriseEditionModule include Gitlab::Utils::StrongMemoize attr_reader :change_access @@ -57,3 +56,5 @@ module Gitlab end end end + +Gitlab::Checks::BaseChecker.prepend_if_ee('EE::Gitlab::Checks::BaseChecker') diff --git a/lib/gitlab/checks/change_access.rb b/lib/gitlab/checks/change_access.rb index 14a445fcb96..8bb5ac94e45 100644 --- a/lib/gitlab/checks/change_access.rb +++ b/lib/gitlab/checks/change_access.rb @@ -3,8 +3,6 @@ module Gitlab module Checks class ChangeAccess - prepend_if_ee('EE::Gitlab::Checks::ChangeAccess') # rubocop: disable Cop/InjectEnterpriseEditionModule - ATTRIBUTES = %i[user_access project skip_authorization skip_lfs_integrity_check protocol oldrev newrev ref branch_name tag_name logger commits].freeze @@ -55,3 +53,5 @@ module Gitlab end end end + +Gitlab::Checks::ChangeAccess.prepend_if_ee('EE::Gitlab::Checks::ChangeAccess') diff --git a/lib/gitlab/checks/diff_check.rb b/lib/gitlab/checks/diff_check.rb index a73f243e946..8780b410a07 100644 --- a/lib/gitlab/checks/diff_check.rb +++ b/lib/gitlab/checks/diff_check.rb @@ -4,7 +4,6 @@ module Gitlab module Checks class DiffCheck < BaseChecker include Gitlab::Utils::StrongMemoize - prepend_if_ee('EE::Gitlab::Checks::DiffCheck') # rubocop: disable Cop/InjectEnterpriseEditionModule LOG_MESSAGES = { validate_file_paths: "Validating diffs' file paths...", @@ -97,3 +96,5 @@ module Gitlab end end end + +Gitlab::Checks::DiffCheck.prepend_if_ee('EE::Gitlab::Checks::DiffCheck') |