diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-30 16:03:29 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-30 16:03:29 +0000 |
| commit | 4b7213db81b45a70e55cfa15b828b4dcdaaa3e8d (patch) | |
| tree | 28517c76624baaf42eee5f7c6a02e509fb7b5956 | |
| parent | 52e1ae0558cc63b4e22ffad23c589a3ea247c00b (diff) | |
| parent | 957a70f6cbc820cd637954d14a8a4b92b8328149 (diff) | |
| download | gitlab-ce-4b7213db81b45a70e55cfa15b828b4dcdaaa3e8d.tar.gz | |
Merge branch 'fix-rubyzip-11-5-stable' into '11-5-stable'
[11.5] Fix requiring the rubyzip Gem
See merge request gitlab/gitlabhq!2877
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -66,7 +66,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' |