diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-04-18 19:02:04 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-04-18 14:16:41 -0500 |
| commit | cd47325959b00a0f6cf38ad1fcfcf1a4400c16b8 (patch) | |
| tree | d825cb16ef2292752d5150fe2d905ea5100988a3 /rubocop | |
| parent | 8815f0f70502e68532a7055db2de50699f63e65a (diff) | |
| download | gitlab-ce-cd47325959b00a0f6cf38ad1fcfcf1a4400c16b8.tar.gz | |
Merge branch 'revert-goldiloader' into 'master'
Revert the addition of goldiloader
See merge request gitlab-org/gitlab-ce!18458
(cherry picked from commit aa2bb207560e06d81ae4fcf07ee4bb86dfa862a1)
Diffstat (limited to 'rubocop')
| -rw-r--r-- | rubocop/cop/gitlab/has_many_through_scope.rb | 45 | ||||
| -rw-r--r-- | rubocop/rubocop.rb | 3 |
2 files changed, 1 insertions, 47 deletions
diff --git a/rubocop/cop/gitlab/has_many_through_scope.rb b/rubocop/cop/gitlab/has_many_through_scope.rb deleted file mode 100644 index 770a2a0529f..00000000000 --- a/rubocop/cop/gitlab/has_many_through_scope.rb +++ /dev/null @@ -1,45 +0,0 @@ -require 'gitlab/styles/rubocop/model_helpers' - -module RuboCop - module Cop - module Gitlab - class HasManyThroughScope < RuboCop::Cop::Cop - include ::Gitlab::Styles::Rubocop::ModelHelpers - - MSG = 'Always provide an explicit scope calling auto_include(false) when using has_many :through'.freeze - - def_node_search :through?, <<~PATTERN - (pair (sym :through) _) - PATTERN - - def_node_matcher :has_many_through?, <<~PATTERN - (send nil? :has_many ... #through?) - PATTERN - - def_node_search :disables_auto_include?, <<~PATTERN - (send _ :auto_include false) - PATTERN - - def_node_matcher :scope_disables_auto_include?, <<~PATTERN - (block (send nil? :lambda) _ #disables_auto_include?) - PATTERN - - def on_send(node) - return unless in_model?(node) - return unless has_many_through?(node) - - target = node - scope_argument = node.children[3] - - if scope_argument.children[0].children.last == :lambda - return if scope_disables_auto_include?(scope_argument) - - target = scope_argument - end - - add_offense(target, location: :expression) - end - end - end - end -end diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb index c2254332e7d..406ec95ffc9 100644 --- a/rubocop/rubocop.rb +++ b/rubocop/rubocop.rb @@ -1,8 +1,7 @@ # rubocop:disable Naming/FileName -require_relative 'cop/gitlab/has_many_through_scope' -require_relative 'cop/gitlab/httparty' require_relative 'cop/gitlab/module_with_instance_variables' require_relative 'cop/gitlab/predicate_memoization' +require_relative 'cop/gitlab/httparty' require_relative 'cop/include_sidekiq_worker' require_relative 'cop/line_break_around_conditional_block' require_relative 'cop/migration/add_column' |