summaryrefslogtreecommitdiff
path: root/lib/safe_zip
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-01-29 07:49:59 -0800
committerYorick Peterse <yorickpeterse@gmail.com>2019-01-31 16:52:51 +0100
commitfc5ebc3cb8ba366a199219a71f9fb7da30ef0001 (patch)
treef28568dcf2c474d95b44e7aea7285ec1cc56e91c /lib/safe_zip
parentc0dbf23cb5be5e71168a21fb087b01ba074cb6c3 (diff)
downloadgitlab-ce-fc5ebc3cb8ba366a199219a71f9fb7da30ef0001.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.
Diffstat (limited to 'lib/safe_zip')
-rw-r--r--lib/safe_zip/extract.rb2
1 files changed, 1 insertions, 1 deletions
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,