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 15:21:01 +0100
commitbb1458fd6fb82a27d574d18faa8843ac5fdfea57 (patch)
treeb92513bf8516d7116754f1bbb463d602c1cbf7cf
parentd1bb5810cc599ed80334950cb0bf5a06dc716dc5 (diff)
downloadgitlab-ce-bb1458fd6fb82a27d574d18faa8843ac5fdfea57.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 f3dc4d85b35..f59e61208ac 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'