diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-30 14:13:05 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-30 14:13:05 +0000 |
| commit | dd69a919ba00ac8e5c1af4cc5de0891b17281641 (patch) | |
| tree | fadf83a39325564e4bbc89bf88ad5c838810587e | |
| parent | aca9ce3eb61b4af37ee47daaf03c5e1e7a06a15d (diff) | |
| parent | 6fa5fd8515e0f2d5a6341134560021f353d84362 (diff) | |
| download | gitlab-ce-dd69a919ba00ac8e5c1af4cc5de0891b17281641.tar.gz | |
Merge branch 'dev-master' into 'master'
[master] Fix uninitialized constant with GitLab Pages deploy
See merge request gitlab/gitlabhq!2875
| -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, |