diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-30 16:03:11 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-30 16:03:11 +0000 |
| commit | f20a32a51e2f65b3761c9e404bca7f27a7a1dba0 (patch) | |
| tree | 05342ed66979e4739b61baa0209304cbcfdb84e0 | |
| parent | dd69a919ba00ac8e5c1af4cc5de0891b17281641 (diff) | |
| parent | ec22c9d2e5f1bbec25db1d87ac2b9bf8c12e8d42 (diff) | |
| download | gitlab-ce-f20a32a51e2f65b3761c9e404bca7f27a7a1dba0.tar.gz | |
Merge branch 'fix-rubyzip-require' into 'master'
[master] Fix requiring the rubyzip Gem
See merge request gitlab/gitlabhq!2876
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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' |