summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2019-01-30 14:16:32 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2019-01-30 14:16:32 +0000
commitec22c9d2e5f1bbec25db1d87ac2b9bf8c12e8d42 (patch)
tree05342ed66979e4739b61baa0209304cbcfdb84e0
parentdd69a919ba00ac8e5c1af4cc5de0891b17281641 (diff)
downloadgitlab-ce-ec22c9d2e5f1bbec25db1d87ac2b9bf8c12e8d42.tar.gz
Fix requiring the rubyzip Gem
In commit 6fa5fd8515e0f2d5a6341134560021f353d84362 the `require: false` was removed to ensure the Gem was loaded at run time. Unfortunately, the `require` necessary for the rubyzip Gem is "zip" and not "rubyzip". As a result, Bundler would not require the Gem. This meant that we would still run into constant errors when referring to `Zip::File`.
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index f30b7fb3041..970e3dd871e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,7 +57,7 @@ gem 'u2f', '~> 0.2.1'
# GitLab Pages
gem 'validates_hostname', '~> 1.0.6'
-gem 'rubyzip', '~> 1.2.2'
+gem 'rubyzip', '~> 1.2.2', require: 'zip'
# Browser detection
gem 'browser', '~> 2.5'