diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-24 15:48:09 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-24 15:48:12 +0300 |
commit | f25ba7820ed2c3f2461c09191369b80d18e9b934 (patch) | |
tree | 57538be60f6ce18281da27e60eb228b3a3579d23 /Gemfile | |
parent | 44a500ef23750c02737442ccec363ff5dd0a4988 (diff) |
Merge branch 'security-extract-pages-with-rubyzip-dev-11-6' into 'security-11-6'
[11.6] Security extract pages with rubyzip
See merge request gitlab/gitlabhq!2834
(cherry picked from commit a55b637dea3b526ad48bd9a27352c5d7ca2d54db)
57be1a57 Extract GitLab Pages using RubyZip
eeeafb9b Fix Gemfile.rails4.lock
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -77,6 +77,7 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.6' +gem 'rubyzip', '~> 1.2.2', require: false # Browser detection gem 'browser', '~> 2.5' |