Merge branch 'upgrade-gitlab-styles-6-1-0' into 'master'

Upgrade gitlab-styles to 6.1.0

See merge request gitlab-org/gitlab!55110

.rubocop.yml

@@ -620,3 +620,12 @@ Gitlab/NamespacedClass:
     - 'ee/elastic/**/*.rb'
     - 'scripts/**/*'
     - 'spec/migrations/**/*.rb'
+
+Lint/HashCompareByIdentity:
+  Enabled: true
+
+Lint/RedundantSafeNavigation:
+  Enabled: true
+
+Style/ClassEqualityComparison:
+  Enabled: true

.rubocop_manual_todo.yml

@@ -2456,3 +2456,69 @@ Gitlab/NamespacedClass:
     - 'spec/support/sidekiq_middleware.rb'
     - 'spec/tasks/gitlab/task_helpers_spec.rb'
     - 'spec/uploaders/object_storage_spec.rb'
+
+# WIP: https://gitlab.com/gitlab-org/gitlab/-/issues/322739
+Style/HashTransformation:
+  Exclude:
+    - 'app/controllers/projects/branches_controller.rb'
+    - 'app/finders/ci/commit_statuses_finder.rb'
+    - 'app/helpers/learn_gitlab_helper.rb'
+    - 'app/models/ci/build_trace_chunk.rb'
+    - 'app/models/concerns/cache_markdown_field.rb'
+    - 'app/models/gpg_key.rb'
+    - 'app/presenters/packages/npm/package_presenter.rb'
+    - 'app/services/ci/pipeline_processing/atomic_processing_service/status_collection.rb'
+    - 'app/services/ci/retry_build_service.rb'
+    - 'app/services/packages/nuget/create_dependency_service.rb'
+    - 'ee/app/models/ee/ci/build.rb'
+    - 'ee/app/models/productivity_analytics.rb'
+    - 'ee/app/models/sca/license_compliance.rb'
+    - 'ee/app/services/security/store_report_service.rb'
+    - 'ee/lib/ee/gitlab/auth/ldap/sync/group.rb'
+    - 'ee/lib/ee/gitlab/usage_data.rb'
+    - 'ee/lib/gitlab/custom_file_templates.rb'
+    - 'ee/spec/elastic_integration/global_search_spec.rb'
+    - 'ee/spec/lib/ee/gitlab/application_context_spec.rb'
+    - 'lib/api/helpers/packages/conan/api_helpers.rb'
+    - 'lib/api/projects.rb'
+    - 'lib/atlassian/jira_connect/client.rb'
+    - 'lib/banzai/filter/repository_link_filter.rb'
+    - 'lib/gitlab/ci/config/entry/product/variables.rb'
+    - 'lib/gitlab/ci/config/entry/variables.rb'
+    - 'lib/gitlab/ci/variables/collection.rb'
+    - 'lib/gitlab/ci/variables/helpers.rb'
+    - 'lib/gitlab/git/commit.rb'
+    - 'lib/gitlab/import_sources.rb'
+    - 'lib/gitlab/language_detection.rb'
+    - 'lib/gitlab/metrics/samplers/database_sampler.rb'
+    - 'lib/gitlab/metrics/subscribers/active_record.rb'
+    - 'lib/gitlab/phabricator_import/project_creator.rb'
+    - 'lib/gitlab/prometheus_client.rb'
+    - 'lib/gitlab/repository_hash_cache.rb'
+    - 'lib/gitlab/static_site_editor/config/file_config.rb'
+    - 'lib/gitlab/template/base_template.rb'
+    - 'lib/gitlab/usage_data_counters/base_counter.rb'
+    - 'lib/gitlab/usage_data_counters/note_counter.rb'
+    - 'spec/lib/atlassian/jira_connect/serializers/pull_request_entity_spec.rb'
+    - 'spec/lib/gitlab/ci/status/composite_spec.rb'
+    - 'spec/lib/gitlab/conflict/file_spec.rb'
+    - 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb'
+    - 'spec/models/concerns/featurable_spec.rb'
+    - 'spec/models/event_spec.rb'
+    - 'spec/models/packages/dependency_spec.rb'
+    - 'spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb'
+    - 'spec/requests/api/graphql/project/alert_management/alert/notes_spec.rb'
+    - 'spec/requests/api/graphql/project/alert_management/alert/todos_spec.rb'
+    - 'spec/requests/api/projects_spec.rb'
+    - 'spec/support/helpers/graphql_helpers.rb'
+    - 'spec/support/import_export/project_tree_expectations.rb'
+    - 'spec/support/shared_contexts/services/projects/container_repository/delete_tags_service_shared_context.rb'
+
+Style/ClassEqualityComparison:
+  Exclude:
+    - spec/lib/peek/views/active_record_spec.rb
+    - ee/spec/lib/peek/views/active_record_spec.rb
+
+Lint/HashCompareByIdentity:
+  Exclude:
+    - ee/lib/gitlab/database/load_balancing/load_balancer.rb

Gemfile

@@ -379,7 +379,7 @@ group :development, :test do
   gem 'spring', '~> 2.1.0'
   gem 'spring-commands-rspec', '~> 1.0.4'
 
-  gem 'gitlab-styles', '~> 6.0.0', require: false
+  gem 'gitlab-styles', '~> 6.1.0', require: false
 
   gem 'haml_lint', '~> 0.36.0', require: false
   gem 'bundler-audit', '~> 0.7.0.1', require: false

Gemfile.lock

@@ -88,7 +88,7 @@ GEM
       asciidoctor (~> 2.0)
     asciidoctor-plantuml (0.0.12)
       asciidoctor (>= 1.5.6, < 3.0.0)
-    ast (2.4.1)
+    ast (2.4.2)
     atlassian-jwt (0.2.0)
       jwt (~> 2.1.0)
     attr_encrypted (3.1.0)
@@ -195,7 +195,7 @@ GEM
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     connection_pool (2.2.2)
     contracts (0.11.0)
     cork (0.3.0)
@@ -463,8 +463,8 @@ GEM
       pry (~> 0.13.0)
     gitlab-sidekiq-fetcher (0.5.5)
       sidekiq (~> 5)
-    gitlab-styles (6.0.0)
-      rubocop (~> 0.91.1)
+    gitlab-styles (6.1.0)
+      rubocop (~> 0.91, >= 0.91.1)
       rubocop-gitlab-security (~> 0.1.1)
       rubocop-performance (~> 1.9.2)
       rubocop-rails (~> 2.9)
@@ -608,7 +608,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.8.7)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     i18n_data (0.8.0)
     icalendar (2.4.1)
@@ -1076,16 +1076,16 @@ GEM
       pg
       rails
       sqlite3
-    rubocop (0.91.1)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.4.0, < 1.0)
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
+    rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
     rubocop-gitlab-security (0.1.1)
       rubocop (>= 0.51)
@@ -1422,7 +1422,7 @@ DEPENDENCIES
   gitlab-net-dns (~> 0.9.1)
   gitlab-pry-byebug
   gitlab-sidekiq-fetcher (= 0.5.5)
-  gitlab-styles (~> 6.0.0)
+  gitlab-styles (~> 6.1.0)
   gitlab_chronic_duration (~> 0.10.6.2)
   gitlab_omniauth-ldap (~> 2.1.1)
   gon (~> 6.2)