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-31 16:52:51 +0100
commitb124fbf3797f8dfc829716788abe8e1694b9af74 (patch)
tree549c85a78af7b8bbd10e77c6b00c3d8bb4c39645
parentdb6406ea12238d8020239409a057220ea6e56479 (diff)
downloadgitlab-ce-b124fbf3797f8dfc829716788abe8e1694b9af74.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 aa9ef8faee1..a5f3afcaa55 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'