summaryrefslogtreecommitdiff
path: root/Gemfile.lock
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 /Gemfile.lock
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 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 0 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 7f243491c90..c2b629a1ecc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -331,9 +331,6 @@ GEM
rubyntlm (~> 0.5)
globalid (0.4.1)
activesupport (>= 4.2.0)
- goldiloader (2.0.1)
- activerecord (>= 4.2, < 5.2)
- activesupport (>= 4.2, < 5.2)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
gon (6.1.0)
@@ -1072,7 +1069,6 @@ DEPENDENCIES
gitlab-markup (~> 1.6.2)
gitlab-styles (~> 2.3)
gitlab_omniauth-ldap (~> 2.0.4)
- goldiloader (~> 2.0)
gon (~> 6.1.0)
google-api-client (~> 0.19.8)
google-protobuf (= 3.5.1)