Merge branch 'fix-rubyzip-require' into 'master'

[master] Fix requiring the rubyzip Gem See merge request gitlab/gitlabhq!2876

Merge branch 'fix-rubyzip-require' into 'master'
[master] Fix requiring the rubyzip Gem See merge request gitlab/gitlabhq!2876
f20a32a5 · Yorick Peterse · dd69a919 · ec22c9d2 · f20a32a5
Commit f20a32a5 authored Jan 30, 2019 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile Gemfile +1 -1

No files found.
--- 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'