diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-01-29 07:49:59 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-01-29 08:11:45 -0800 |
| commit | 6fa5fd8515e0f2d5a6341134560021f353d84362 (patch) | |
| tree | cd22692fc308a9fbf6f4f589e3505e087c4a4dee | |
| parent | 20d6be4d8c39d6045547c0e7a533258479eebd8d (diff) | |
| download | gitlab-ce-6fa5fd8515e0f2d5a6341134560021f353d84362.tar.gz | |
Fix uninitialized constant with GitLab Pages deploy
pages:deploy step was failing with the following error:
```
unitialized constant SafeZip::Extract::Zip
```
Since license_finder already pulls in rubyzip, we can make it
a required gem. We also use the scope operator to make the reference to
Zip::File explicit.
| -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
@@ -57,7 +57,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, |