Commit 5c58651a authored by Robert Speicher's avatar Robert Speicher

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
parents d498fa47 11068dae
......@@ -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'
......
---
title: Fix uninitialized constant with GitLab Pages
merge_request:
author:
type: fixed
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment