diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-04-18 22:02:04 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-04-18 22:02:04 +0300 |
| commit | aa2bb207560e06d81ae4fcf07ee4bb86dfa862a1 (patch) | |
| tree | 3a227f2fff78f9fbd1dc5c5ad3a7563cf578d053 /Gemfile.lock | |
| parent | 371a9edc96810385189bb779ab2b43c19991d7dd (diff) | |
| parent | 1a2728d940a4349f9d22f71f3a8180c72545e56d (diff) | |
Merge branch 'revert-goldiloader' into 'master'
Revert the addition of goldiloader
See merge request gitlab-org/gitlab-ce!18458
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3076fbee6a8..d6ea73da805 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) |