Commit 287fcdb1 authored by Thong Kuah's avatar Thong Kuah

Merge branch 'mk-gitlab-styles-6.6' into 'master'

Bump gitlab-styles to 6.6.0

See merge request gitlab-org/gitlab!75202
parents a7ce1ba9 3902d3e7
......@@ -2774,3 +2774,9 @@ GraphQL/ResolverMethodLength:
- 'app/graphql/types/ci/runner_type.rb'
- 'app/graphql/types/ci/stage_type.rb'
- 'app/graphql/types/packages/package_type.rb'
# Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/345673
Performance/Rubyzip:
Exclude:
- 'app/services/packages/nuget/metadata_extraction_service.rb'
- 'lib/gitlab/ci/artifact_file_reader.rb'
......@@ -376,7 +376,7 @@ group :development, :test do
gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 6.5.0', require: false
gem 'gitlab-styles', '~> 6.6.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false
......
......@@ -497,7 +497,7 @@ GEM
openid_connect (~> 1.2)
gitlab-sidekiq-fetcher (0.8.0)
sidekiq (~> 6.1)
gitlab-styles (6.5.0)
gitlab-styles (6.6.0)
rubocop (~> 0.91, >= 0.91.1)
rubocop-gitlab-security (~> 0.1.1)
rubocop-graphql (~> 0.10)
......@@ -1479,7 +1479,7 @@ DEPENDENCIES
gitlab-net-dns (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.8.0)
gitlab-sidekiq-fetcher (= 0.8.0)
gitlab-styles (~> 6.5.0)
gitlab-styles (~> 6.6.0)
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.4.0)
......
......@@ -25,7 +25,9 @@ module Pages
FileUtils.rm_f(output_file)
entries_count = 0
::Zip::File.open(output_file, ::Zip::File::CREATE) do |zipfile|
# Since we're writing not reading here, we can safely silence the cop.
# It currently cannot discern between opening for reading or writing.
::Zip::File.open(output_file, ::Zip::File::CREATE) do |zipfile| # rubocop:disable Performance/Rubyzip
write_entry(zipfile, PUBLIC_DIR)
entries_count = zipfile.entries.count
end
......
......@@ -25,7 +25,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| # rubocop:disable Performance/Rubyzip
# 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