diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
| commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
| tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /spec/rubocop_spec_helper.rb | |
| parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) | |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'spec/rubocop_spec_helper.rb')
| -rw-r--r-- | spec/rubocop_spec_helper.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/spec/rubocop_spec_helper.rb b/spec/rubocop_spec_helper.rb index cf747132ec1..d57461960f2 100644 --- a/spec/rubocop_spec_helper.rb +++ b/spec/rubocop_spec_helper.rb @@ -12,10 +12,7 @@ require_relative './support/shared_contexts/rubocop_default_rspec_language_confi RSpec.configure do |config| config.define_derived_metadata(file_path: %r{spec/rubocop}) do |metadata| - # TODO: move DuplicateSpecLocation cop to RSpec::DuplicateSpecLocation - unless metadata[:type] == :rubocop_rspec - metadata[:type] = :rubocop - end + metadata[:type] = :rubocop end config.define_derived_metadata(file_path: %r{spec/rubocop/cop/rspec}) do |metadata| |