Commit fffc4b4a authored by Rajendra Kadam's avatar Rajendra Kadam Committed by Peter Leitzen

Move prepend to the last line in lib/gitlab - 3

parent 0a49a02f
---
title: Move prepend to last line in lib/gitlab files
merge_request: 30194
author: Rajendra Kadam
type: fixed
...@@ -4,8 +4,6 @@ module Gitlab ...@@ -4,8 +4,6 @@ module Gitlab
module Auth module Auth
module Saml module Saml
class Config class Config
prepend_if_ee('::EE::Gitlab::Auth::Saml::Config') # rubocop: disable Cop/InjectEnterpriseEditionModule
class << self class << self
def options def options
Gitlab::Auth::OAuth::Provider.config_for('saml') Gitlab::Auth::OAuth::Provider.config_for('saml')
...@@ -31,3 +29,5 @@ module Gitlab ...@@ -31,3 +29,5 @@ module Gitlab
end end
end end
end end
Gitlab::Auth::Saml::Config.prepend_if_ee('::EE::Gitlab::Auth::Saml::Config')
...@@ -9,8 +9,6 @@ module Gitlab ...@@ -9,8 +9,6 @@ module Gitlab
module Auth module Auth
module Saml module Saml
class User < Gitlab::Auth::OAuth::User class User < Gitlab::Auth::OAuth::User
prepend_if_ee('::EE::Gitlab::Auth::Saml::User') # rubocop: disable Cop/InjectEnterpriseEditionModule
extend ::Gitlab::Utils::Override extend ::Gitlab::Utils::Override
def save def save
...@@ -63,3 +61,5 @@ module Gitlab ...@@ -63,3 +61,5 @@ module Gitlab
end end
end end
end end
Gitlab::Auth::Saml::User.prepend_if_ee('::EE::Gitlab::Auth::Saml::User')
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
module Gitlab module Gitlab
module Checks module Checks
class BaseChecker class BaseChecker
prepend_if_ee('EE::Gitlab::Checks::BaseChecker') # rubocop: disable Cop/InjectEnterpriseEditionModule
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
attr_reader :change_access attr_reader :change_access
...@@ -57,3 +56,5 @@ module Gitlab ...@@ -57,3 +56,5 @@ module Gitlab
end end
end end
end end
Gitlab::Checks::BaseChecker.prepend_if_ee('EE::Gitlab::Checks::BaseChecker')
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
module Gitlab module Gitlab
module Checks module Checks
class ChangeAccess class ChangeAccess
prepend_if_ee('EE::Gitlab::Checks::ChangeAccess') # rubocop: disable Cop/InjectEnterpriseEditionModule
ATTRIBUTES = %i[user_access project skip_authorization ATTRIBUTES = %i[user_access project skip_authorization
skip_lfs_integrity_check protocol oldrev newrev ref skip_lfs_integrity_check protocol oldrev newrev ref
branch_name tag_name logger commits].freeze branch_name tag_name logger commits].freeze
...@@ -55,3 +53,5 @@ module Gitlab ...@@ -55,3 +53,5 @@ module Gitlab
end end
end end
end end
Gitlab::Checks::ChangeAccess.prepend_if_ee('EE::Gitlab::Checks::ChangeAccess')
...@@ -4,7 +4,6 @@ module Gitlab ...@@ -4,7 +4,6 @@ module Gitlab
module Checks module Checks
class DiffCheck < BaseChecker class DiffCheck < BaseChecker
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
prepend_if_ee('EE::Gitlab::Checks::DiffCheck') # rubocop: disable Cop/InjectEnterpriseEditionModule
LOG_MESSAGES = { LOG_MESSAGES = {
validate_file_paths: "Validating diffs' file paths...", validate_file_paths: "Validating diffs' file paths...",
...@@ -97,3 +96,5 @@ module Gitlab ...@@ -97,3 +96,5 @@ module Gitlab
end end
end end
end end
Gitlab::Checks::DiffCheck.prepend_if_ee('EE::Gitlab::Checks::DiffCheck')
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
module Gitlab module Gitlab
module Ci module Ci
module Parsers module Parsers
prepend_if_ee('::EE::Gitlab::Ci::Parsers') # rubocop: disable Cop/InjectEnterpriseEditionModule
ParserNotFoundError = Class.new(ParserError) ParserNotFoundError = Class.new(ParserError)
def self.parsers def self.parsers
...@@ -23,3 +21,5 @@ module Gitlab ...@@ -23,3 +21,5 @@ module Gitlab
end end
end end
end end
Gitlab::Ci::Parsers.prepend_if_ee('::EE::Gitlab::Ci::Parsers')
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment