diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-01-30 01:53:32 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-01-30 01:53:32 +0300 |
| commit | 5c58651ac9aed3b6307b6b579c826dcddfaea87d (patch) | |
| tree | e6de090396b332946f5946c05aeff32a697bf51e | |
| parent | d498fa47d663f3c6554ffcc67f37e749819f266b (diff) | |
| parent | 11068dae2863ea6e1af9d9109eb4611134b3c53c (diff) | |
Merge branch 'sh-fix-pages-zip-constant-11-5' into '11-5-stable'
[11.5] Fix uninitialized constant with GitLab Pages deploy
See merge request gitlab/gitlabhq!2874
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-pages-zip-constant.yml | 5 | ||||
| -rw-r--r-- | lib/safe_zip/extract.rb | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -66,7 +66,7 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.6' -gem 'rubyzip', '~> 1.2.2', require: false +gem 'rubyzip', '~> 1.2.2' # Browser detection gem 'browser', '~> 2.5' diff --git a/changelogs/unreleased/sh-fix-pages-zip-constant.yml b/changelogs/unreleased/sh-fix-pages-zip-constant.yml new file mode 100644 index 00000000000..fcd8aa45825 --- /dev/null +++ b/changelogs/unreleased/sh-fix-pages-zip-constant.yml @@ -0,0 +1,5 @@ +--- +title: Fix uninitialized constant with GitLab Pages +merge_request: +author: +type: fixed diff --git a/lib/safe_zip/extract.rb b/lib/safe_zip/extract.rb index 3bd4935ef34..679c021c730 100644 --- a/lib/safe_zip/extract.rb +++ b/lib/safe_zip/extract.rb @@ -29,7 +29,7 @@ module SafeZip private def extract_with_ruby_zip(params) - Zip::File.open(archive_path) do |zip_archive| + ::Zip::File.open(archive_path) do |zip_archive| # Extract all files in the following order: # 1. Directories first, # 2. Files next, |