summaryrefslogtreecommitdiff
path: root/rubocop/rubocop.rb
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2018-04-18 15:41:42 +0200
committerYorick Peterse <yorickpeterse@gmail.com>2018-04-18 15:51:39 +0200
commit6f292eaa69c771cec8a81d2edaad19a26ab3eae6 (patch)
tree30ef0c062121834b2dca4f4a87bc7af72e071962 /rubocop/rubocop.rb
parent019c0d5761b55ca21fd71d547dd4a2ebf14d615f (diff)
downloadgitlab-ce-6f292eaa69c771cec8a81d2edaad19a26ab3eae6.tar.gz
Revert the addition of goldiloader
This reverts the addition of the "goldiloader" Gem and all use of it. While this Gem is very promising it's causing a variety of problems on GitLab.com due to it eager-loading too much data in places where we don't expect/can handle this. At least for the time being this means we have to go back to manually fixing N+1 query problems, but at least those should not cause a negative impact on availability.
Diffstat (limited to 'rubocop/rubocop.rb')
-rw-r--r--rubocop/rubocop.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb
index 96061672749..f05990232ab 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/avoid_return_from_blocks'
require_relative 'cop/avoid_break_from_strong_memoize'