diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-30 16:03:32 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-30 16:03:32 +0000 |
| commit | 0706c8a9fb9473328b6fded06bd087f0b667e9f6 (patch) | |
| tree | dd2a492c9d469e608d61d683203dbc95db7cfa8a | |
| parent | 900a3a8a300217dff83cd7e5df3fe768adcb0faa (diff) | |
| parent | d72dcf179dda965c9df1909ad28cb5aa426660bc (diff) | |
| download | gitlab-ce-0706c8a9fb9473328b6fded06bd087f0b667e9f6.tar.gz | |
Merge branch 'fix-rubyzip-11-6-stable' into '11-6-stable'
[11.6] Fix requiring the rubyzip Gem
See merge request gitlab/gitlabhq!2878
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -77,7 +77,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' |