Commit b259e03f authored by Yorick Peterse's avatar Yorick Peterse

Disable EE injection cop for existing offenses

This disables InjectEnterpriseEditionModule for all existing offenses.
parent 0a42721f
# frozen_string_literal: true # frozen_string_literal: true
class ConfirmationsController < Devise::ConfirmationsController class ConfirmationsController < Devise::ConfirmationsController
prepend ::EE::ConfirmationsController prepend ::EE::ConfirmationsController # rubocop: disable Cop/InjectEnterpriseEditionModule
include AcceptsPendingInvitations include AcceptsPendingInvitations
......
...@@ -32,5 +32,5 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController ...@@ -32,5 +32,5 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController
end end
end end
Ldap::OmniauthCallbacksController.prepend(EE::OmniauthCallbacksController) Ldap::OmniauthCallbacksController.prepend(EE::OmniauthCallbacksController) # rubocop: disable Cop/InjectEnterpriseEditionModule
Ldap::OmniauthCallbacksController.prepend(EE::Ldap::OmniauthCallbacksController) Ldap::OmniauthCallbacksController.prepend(EE::Ldap::OmniauthCallbacksController)
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
class LicenseTemplateFinder class LicenseTemplateFinder
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
prepend ::EE::LicenseTemplateFinder prepend ::EE::LicenseTemplateFinder # rubocop: disable Cop/InjectEnterpriseEditionModule
attr_reader :project, :params attr_reader :project, :params
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
class ProjectsFinder < UnionFinder class ProjectsFinder < UnionFinder
include CustomAttributesFilter include CustomAttributesFilter
prepend ::EE::ProjectsFinder prepend ::EE::ProjectsFinder # rubocop: disable Cop/InjectEnterpriseEditionModule
attr_accessor :params attr_accessor :params
attr_reader :current_user, :project_ids_relation attr_reader :current_user, :project_ids_relation
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
class TemplateFinder class TemplateFinder
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
prepend ::EE::TemplateFinder prepend ::EE::TemplateFinder # rubocop: disable Cop/InjectEnterpriseEditionModule
VENDORED_TEMPLATES = HashWithIndifferentAccess.new( VENDORED_TEMPLATES = HashWithIndifferentAccess.new(
dockerfiles: ::Gitlab::Template::DockerfileTemplate, dockerfiles: ::Gitlab::Template::DockerfileTemplate,
......
...@@ -227,7 +227,7 @@ module ApplicationSettingsHelper ...@@ -227,7 +227,7 @@ module ApplicationSettingsHelper
end end
end end
ApplicationSettingsHelper.prepend(EE::ApplicationSettingsHelper) ApplicationSettingsHelper.prepend(EE::ApplicationSettingsHelper) # rubocop: disable Cop/InjectEnterpriseEditionModule
# The methods in `EE::ApplicationSettingsHelper` should be available as both # The methods in `EE::ApplicationSettingsHelper` should be available as both
# instance and class methods. # instance and class methods.
......
...@@ -100,7 +100,7 @@ module AuthHelper ...@@ -100,7 +100,7 @@ module AuthHelper
extend self extend self
end end
AuthHelper.prepend(EE::AuthHelper) AuthHelper.prepend(EE::AuthHelper) # rubocop: disable Cop/InjectEnterpriseEditionModule
# The methods added in EE should be available as both class and instance # The methods added in EE should be available as both class and instance
# methods, just like the methods provided by `AuthHelper` itself. # methods, just like the methods provided by `AuthHelper` itself.
......
# frozen_string_literal: true # frozen_string_literal: true
module EnvironmentsHelper module EnvironmentsHelper
prepend ::EE::EnvironmentsHelper prepend ::EE::EnvironmentsHelper # rubocop: disable Cop/InjectEnterpriseEditionModule
def environments_list_data def environments_list_data
{ {
......
# frozen_string_literal: true # frozen_string_literal: true
module FormHelper module FormHelper
prepend ::EE::FormHelper prepend ::EE::FormHelper # rubocop: disable Cop/InjectEnterpriseEditionModule
def form_errors(model, type: 'form') def form_errors(model, type: 'form')
return unless model.errors.any? return unless model.errors.any?
......
# frozen_string_literal: true # frozen_string_literal: true
module ProjectsHelper module ProjectsHelper
prepend ::EE::ProjectsHelper prepend ::EE::ProjectsHelper # rubocop: disable Cop/InjectEnterpriseEditionModule
def link_to_project(project) def link_to_project(project)
link_to namespace_project_path(namespace_id: project.namespace, id: project), title: h(project.name) do link_to namespace_project_path(namespace_id: project.namespace, id: project), title: h(project.name) do
......
...@@ -45,7 +45,7 @@ module ServicesHelper ...@@ -45,7 +45,7 @@ module ServicesHelper
extend self extend self
end end
ServicesHelper.prepend(EE::ServicesHelper) ServicesHelper.prepend(EE::ServicesHelper) # rubocop: disable Cop/InjectEnterpriseEditionModule
# The methods in `EE::ServicesHelper` should be available as both instance and # The methods in `EE::ServicesHelper` should be available as both instance and
# class methods. # class methods.
......
# frozen_string_literal: true # frozen_string_literal: true
module SortingHelper module SortingHelper
prepend ::EE::SortingHelper prepend ::EE::SortingHelper # rubocop: disable Cop/InjectEnterpriseEditionModule
def sort_options_hash def sort_options_hash
{ {
......
...@@ -39,7 +39,7 @@ module SystemNoteHelper ...@@ -39,7 +39,7 @@ module SystemNoteHelper
extend self extend self
end end
SystemNoteHelper.prepend(EE::SystemNoteHelper) SystemNoteHelper.prepend(EE::SystemNoteHelper) # rubocop: disable Cop/InjectEnterpriseEditionModule
# The methods in `EE::SystemNoteHelper` should be available as both instance and # The methods in `EE::SystemNoteHelper` should be available as both instance and
# class methods. # class methods.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module Emails module Emails
module MergeRequests module MergeRequests
prepend Emails::EE::MergeRequests prepend Emails::EE::MergeRequests # rubocop: disable Cop/InjectEnterpriseEditionModule
def new_merge_request_email(recipient_id, merge_request_id, reason = nil) def new_merge_request_email(recipient_id, merge_request_id, reason = nil)
setup_merge_request_mail(merge_request_id, recipient_id, present: true) setup_merge_request_mail(merge_request_id, recipient_id, present: true)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module Emails module Emails
module Notes module Notes
prepend Emails::EE::Notes prepend Emails::EE::Notes # rubocop: disable Cop/InjectEnterpriseEditionModule
def note_commit_email(recipient_id, note_id) def note_commit_email(recipient_id, note_id)
setup_note_mail(note_id, recipient_id) setup_note_mail(note_id, recipient_id)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module Emails module Emails
module Projects module Projects
prepend Emails::EE::Projects prepend Emails::EE::Projects # rubocop: disable Cop/InjectEnterpriseEditionModule
def project_was_moved_email(project_id, user_id, old_path_with_namespace) def project_was_moved_email(project_id, user_id, old_path_with_namespace)
@current_user = @user = User.find user_id @current_user = @user = User.find user_id
......
# frozen_string_literal: true # frozen_string_literal: true
class Notify < BaseMailer class Notify < BaseMailer
prepend ::EE::Notify prepend ::EE::Notify # rubocop: disable Cop/InjectEnterpriseEditionModule
include ActionDispatch::Routing::PolymorphicRoutes include ActionDispatch::Routing::PolymorphicRoutes
include GitlabRoutingHelper include GitlabRoutingHelper
......
...@@ -7,7 +7,7 @@ class CommitStatus < ActiveRecord::Base ...@@ -7,7 +7,7 @@ class CommitStatus < ActiveRecord::Base
include Presentable include Presentable
include EnumWithNil include EnumWithNil
prepend ::EE::CommitStatus prepend ::EE::CommitStatus # rubocop: disable Cop/InjectEnterpriseEditionModule
self.table_name = 'ci_builds' self.table_name = 'ci_builds'
......
...@@ -5,7 +5,8 @@ module PrometheusAdapter ...@@ -5,7 +5,8 @@ module PrometheusAdapter
included do included do
include ReactiveCaching include ReactiveCaching
prepend EE::PrometheusAdapter # We can't prepend outside of this model due to the use of `included`, so this must stay here. # We can't prepend outside of this model due to the use of `included`, so this must stay here.
prepend EE::PrometheusAdapter # rubocop: disable Cop/InjectEnterpriseEditionModule
self.reactive_cache_key = ->(adapter) { [adapter.class.model_name.singular, adapter.id] } self.reactive_cache_key = ->(adapter) { [adapter.class.model_name.singular, adapter.id] }
self.reactive_cache_lease_timeout = 30.seconds self.reactive_cache_lease_timeout = 30.seconds
......
...@@ -52,7 +52,7 @@ module ProtectedRefAccess ...@@ -52,7 +52,7 @@ module ProtectedRefAccess
end end
ProtectedRefAccess.include(EE::ProtectedRefAccess::Scopes) ProtectedRefAccess.include(EE::ProtectedRefAccess::Scopes)
ProtectedRefAccess.prepend(EE::ProtectedRefAccess) ProtectedRefAccess.prepend(EE::ProtectedRefAccess) # rubocop: disable Cop/InjectEnterpriseEditionModule
# When using `prepend` (or `include` for that matter), the `ClassMethods` # When using `prepend` (or `include` for that matter), the `ClassMethods`
# constants are not merged. This means that `class_methods` in # constants are not merged. This means that `class_methods` in
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
# #
# A note of this type can be resolvable. # A note of this type can be resolvable.
class DiscussionNote < Note class DiscussionNote < Note
prepend EE::DiscussionNote # This prepend must stay here because the `validates` below depends on it. # This prepend must stay here because the `validates` below depends on it.
prepend EE::DiscussionNote # rubocop: disable Cop/InjectEnterpriseEditionModule
# Names of all implementers of `Noteable` that support discussions. # Names of all implementers of `Noteable` that support discussions.
def self.noteable_types def self.noteable_types
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
class GlobalMilestone class GlobalMilestone
include Milestoneish include Milestoneish
include ::EE::GlobalMilestone include ::EE::GlobalMilestone # rubocop: disable Cop/InjectEnterpriseEditionModule
EPOCH = DateTime.parse('1970-01-01') EPOCH = DateTime.parse('1970-01-01')
STATE_COUNT_HASH = { opened: 0, closed: 0, all: 0 }.freeze STATE_COUNT_HASH = { opened: 0, closed: 0, all: 0 }.freeze
......
# frozen_string_literal: true # frozen_string_literal: true
# Group Milestones are milestones that can be shared among many projects within the same group # Group Milestones are milestones that can be shared among many projects within the same group
class GroupMilestone < GlobalMilestone class GroupMilestone < GlobalMilestone
include ::EE::GroupMilestone include ::EE::GroupMilestone # rubocop: disable Cop/InjectEnterpriseEditionModule
attr_accessor :group attr_accessor :group
......
# frozen_string_literal: true # frozen_string_literal: true
class List < ActiveRecord::Base class List < ActiveRecord::Base
prepend ::EE::List prepend ::EE::List # rubocop: disable Cop/InjectEnterpriseEditionModule
belongs_to :board belongs_to :board
belongs_to :label belongs_to :label
......
# frozen_string_literal: true # frozen_string_literal: true
class MembersPreloader class MembersPreloader
prepend EE::MembersPreloader prepend EE::MembersPreloader # rubocop: disable Cop/InjectEnterpriseEditionModule
attr_reader :members attr_reader :members
......
...@@ -25,7 +25,7 @@ class MergeRequest < ActiveRecord::Base ...@@ -25,7 +25,7 @@ class MergeRequest < ActiveRecord::Base
:ref_fetched, :ref_fetched,
:deleted_at :deleted_at
prepend ::EE::MergeRequest prepend ::EE::MergeRequest # rubocop: disable Cop/InjectEnterpriseEditionModule
belongs_to :target_project, class_name: "Project" belongs_to :target_project, class_name: "Project"
belongs_to :source_project, class_name: "Project" belongs_to :source_project, class_name: "Project"
......
...@@ -18,7 +18,7 @@ class Milestone < ActiveRecord::Base ...@@ -18,7 +18,7 @@ class Milestone < ActiveRecord::Base
include Milestoneish include Milestoneish
include Gitlab::SQL::Pattern include Gitlab::SQL::Pattern
prepend ::EE::Milestone prepend ::EE::Milestone # rubocop: disable Cop/InjectEnterpriseEditionModule
cache_markdown_field :title, pipeline: :single_line cache_markdown_field :title, pipeline: :single_line
cache_markdown_field :description cache_markdown_field :description
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
class ProjectAuthorization < ActiveRecord::Base class ProjectAuthorization < ActiveRecord::Base
include FromUnion include FromUnion
prepend ::EE::ProjectAuthorization prepend ::EE::ProjectAuthorization # rubocop: disable Cop/InjectEnterpriseEditionModule
belongs_to :user belongs_to :user
belongs_to :project belongs_to :project
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'carrierwave/orm/activerecord' require 'carrierwave/orm/activerecord'
class ProjectImportData < ActiveRecord::Base class ProjectImportData < ActiveRecord::Base
prepend ::EE::ProjectImportData prepend ::EE::ProjectImportData # rubocop: disable Cop/InjectEnterpriseEditionModule
belongs_to :project, inverse_of: :import_data belongs_to :project, inverse_of: :import_data
attr_encrypted :credentials, attr_encrypted :credentials,
......
...@@ -17,7 +17,7 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated ...@@ -17,7 +17,7 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
presents :build presents :build
prepend ::EE::CommitStatusPresenter prepend ::EE::CommitStatusPresenter # rubocop: disable Cop/InjectEnterpriseEditionModule
def self.callout_failure_messages def self.callout_failure_messages
CALLOUT_FAILURE_MESSAGES CALLOUT_FAILURE_MESSAGES
......
# frozen_string_literal: true # frozen_string_literal: true
class BuildDetailsEntity < JobEntity class BuildDetailsEntity < JobEntity
prepend ::EE::BuildDetailEntity prepend ::EE::BuildDetailEntity # rubocop: disable Cop/InjectEnterpriseEditionModule
expose :coverage, :erased_at, :duration expose :coverage, :erased_at, :duration
expose :tag_list, as: :tags expose :tag_list, as: :tags
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
class EnvironmentEntity < Grape::Entity class EnvironmentEntity < Grape::Entity
include RequestAwareEntity include RequestAwareEntity
prepend ::EE::EnvironmentEntity prepend ::EE::EnvironmentEntity # rubocop: disable Cop/InjectEnterpriseEditionModule
expose :id expose :id
expose :name expose :name
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
class IssuableSidebarEntity < Grape::Entity class IssuableSidebarEntity < Grape::Entity
include TimeTrackableEntity include TimeTrackableEntity
include RequestAwareEntity include RequestAwareEntity
prepend ::EE::IssuableSidebarEntity prepend ::EE::IssuableSidebarEntity # rubocop: disable Cop/InjectEnterpriseEditionModule
expose :participants, using: ::API::Entities::UserBasic do |issuable| expose :participants, using: ::API::Entities::UserBasic do |issuable|
issuable.participants(request.current_user) issuable.participants(request.current_user)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
class IssueBoardEntity < Grape::Entity class IssueBoardEntity < Grape::Entity
include RequestAwareEntity include RequestAwareEntity
prepend ::EE::IssueBoardEntity prepend ::EE::IssueBoardEntity # rubocop: disable Cop/InjectEnterpriseEditionModule
expose :id expose :id
expose :iid expose :iid
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
class IssueEntity < IssuableEntity class IssueEntity < IssuableEntity
include TimeTrackableEntity include TimeTrackableEntity
prepend ::EE::IssueEntity prepend ::EE::IssueEntity # rubocop: disable Cop/InjectEnterpriseEditionModule
expose :state expose :state
expose :milestone_id expose :milestone_id
......
# frozen_string_literal: true # frozen_string_literal: true
class IssueSidebarEntity < IssuableSidebarEntity class IssueSidebarEntity < IssuableSidebarEntity
prepend ::EE::IssueSidebarEntity prepend ::EE::IssueSidebarEntity # rubocop: disable Cop/InjectEnterpriseEditionModule
expose :assignees, using: API::Entities::UserBasic expose :assignees, using: API::Entities::UserBasic
end end
# frozen_string_literal: true # frozen_string_literal: true
class MergeRequestWidgetEntity < IssuableEntity class MergeRequestWidgetEntity < IssuableEntity
prepend ::EE::MergeRequestWidgetEntity prepend ::EE::MergeRequestWidgetEntity # rubocop: disable Cop/InjectEnterpriseEditionModule
expose :state expose :state
expose :in_progress_merge_commit_sha expose :in_progress_merge_commit_sha
......
# frozen_string_literal: true # frozen_string_literal: true
class ProjectMirrorEntity < Grape::Entity class ProjectMirrorEntity < Grape::Entity
prepend ::EE::ProjectMirrorEntity prepend ::EE::ProjectMirrorEntity # rubocop: disable Cop/InjectEnterpriseEditionModule
expose :id expose :id
......
# frozen_string_literal: true # frozen_string_literal: true
class VariableEntity < Grape::Entity class VariableEntity < Grape::Entity
prepend ::EE::VariableEntity prepend ::EE::VariableEntity # rubocop: disable Cop/InjectEnterpriseEditionModule
expose :id expose :id
expose :key expose :key
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Base class for services that count a single resource such as the number of # Base class for services that count a single resource such as the number of
# issues for a project. # issues for a project.
class BaseCountService class BaseCountService
prepend ::EE::BaseCountService prepend ::EE::BaseCountService # rubocop: disable Cop/InjectEnterpriseEditionModule
def relation_for_count def relation_for_count
raise( raise(
......
# frozen_string_literal: true # frozen_string_literal: true
class IssuableBaseService < BaseService class IssuableBaseService < BaseService
prepend ::EE::IssuableBaseService prepend ::EE::IssuableBaseService # rubocop: disable Cop/InjectEnterpriseEditionModule
private private
......
...@@ -11,7 +11,7 @@ module EE ...@@ -11,7 +11,7 @@ module EE
WEIGHT_ANY = 'Any'.freeze WEIGHT_ANY = 'Any'.freeze
WEIGHT_NONE = 'None'.freeze WEIGHT_NONE = 'None'.freeze
prepend EE::RelativePositioning prepend EE::RelativePositioning # rubocop: disable Cop/InjectEnterpriseEditionModule
include Elastic::IssuesSearch include Elastic::IssuesSearch
scope :order_weight_desc, -> { reorder ::Gitlab::Database.nulls_last_order('weight', 'DESC') } scope :order_weight_desc, -> { reorder ::Gitlab::Database.nulls_last_order('weight', 'DESC') }
......
...@@ -10,13 +10,13 @@ module EE ...@@ -10,13 +10,13 @@ module EE
extend ::Gitlab::Utils::Override extend ::Gitlab::Utils::Override
extend ::Gitlab::Cache::RequestCache extend ::Gitlab::Cache::RequestCache
include ::Gitlab::Utils::StrongMemoize include ::Gitlab::Utils::StrongMemoize
include ::EE::GitlabRoutingHelper include ::EE::GitlabRoutingHelper # rubocop: disable Cop/InjectEnterpriseEditionModule
GIT_LFS_DOWNLOAD_OPERATION = 'download'.freeze GIT_LFS_DOWNLOAD_OPERATION = 'download'.freeze
prepended do prepended do
include Elastic::ProjectsSearch include Elastic::ProjectsSearch
include EE::DeploymentPlatform include EE::DeploymentPlatform # rubocop: disable Cop/InjectEnterpriseEditionModule
include EachBatch include EachBatch
ignore_column :mirror_last_update_at, ignore_column :mirror_last_update_at,
......
...@@ -12,7 +12,7 @@ module EE ...@@ -12,7 +12,7 @@ module EE
# ::SystemNoteService wants the methods to be available as both class and # ::SystemNoteService wants the methods to be available as both class and
# instance methods. This removes the need for having to both `include` and # instance methods. This removes the need for having to both `include` and
# `extend` this module everywhere it is used. # `extend` this module everywhere it is used.
extend(EE::SystemNoteService) extend(EE::SystemNoteService) # rubocop: disable Cop/InjectEnterpriseEditionModule
end end
# #
......
...@@ -2,7 +2,7 @@ module EE ...@@ -2,7 +2,7 @@ module EE
module Gitlab module Gitlab
module GeoGitAccess module GeoGitAccess
include ::Gitlab::ConfigHelper include ::Gitlab::ConfigHelper
include ::EE::GitlabRoutingHelper include ::EE::GitlabRoutingHelper # rubocop: disable Cop/InjectEnterpriseEditionModule
include GrapePathHelpers::NamedRouteMatcher include GrapePathHelpers::NamedRouteMatcher
extend ::Gitlab::Utils::Override extend ::Gitlab::Utils::Override
......
...@@ -4,7 +4,7 @@ require 'flipper/adapters/active_record' ...@@ -4,7 +4,7 @@ require 'flipper/adapters/active_record'
require 'flipper/adapters/active_support_cache_store' require 'flipper/adapters/active_support_cache_store'
class Feature class Feature
prepend EE::Feature prepend EE::Feature # rubocop: disable Cop/InjectEnterpriseEditionModule
# Classes to override flipper table names # Classes to override flipper table names
class FlipperFeature < Flipper::Adapters::ActiveRecord::Feature class FlipperFeature < Flipper::Adapters::ActiveRecord::Feature
......
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