Commit 7ef9812f authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '41480-require-custom-cops' into 'master'

Enable our own custom cops, again?

Closes #41480

See merge request gitlab-org/gitlab-ce!16132
parents 58a705aa cc7a7aad
...@@ -3,6 +3,7 @@ inherit_gem: ...@@ -3,6 +3,7 @@ inherit_gem:
- rubocop-default.yml - rubocop-default.yml
inherit_from: .rubocop_todo.yml inherit_from: .rubocop_todo.yml
require: ./rubocop/rubocop
AllCops: AllCops:
TargetRailsVersion: 4.2 TargetRailsVersion: 4.2
...@@ -24,8 +25,10 @@ Gitlab/ModuleWithInstanceVariables: ...@@ -24,8 +25,10 @@ Gitlab/ModuleWithInstanceVariables:
Exclude: Exclude:
# We ignore Rails helpers right now because it's hard to workaround it # We ignore Rails helpers right now because it's hard to workaround it
- app/helpers/**/*_helper.rb - app/helpers/**/*_helper.rb
- ee/app/helpers/**/*_helper.rb
# We ignore Rails mailers right now because it's hard to workaround it # We ignore Rails mailers right now because it's hard to workaround it
- app/mailers/emails/**/*.rb - app/mailers/emails/**/*.rb
- ee/**/emails/**/*.rb
# We ignore spec helpers because it usually doesn't matter # We ignore spec helpers because it usually doesn't matter
- spec/support/**/*.rb - spec/support/**/*.rb
- features/steps/**/*.rb - features/steps/**/*.rb
require_relative 'cop/active_record_dependent'
require_relative 'cop/gitlab/module_with_instance_variables' require_relative 'cop/gitlab/module_with_instance_variables'
require_relative 'cop/include_sidekiq_worker' require_relative 'cop/include_sidekiq_worker'
require_relative 'cop/migration/add_column' require_relative 'cop/migration/add_column'
...@@ -18,6 +17,4 @@ require_relative 'cop/migration/update_column_in_batches' ...@@ -18,6 +17,4 @@ require_relative 'cop/migration/update_column_in_batches'
require_relative 'cop/migration/update_large_table' require_relative 'cop/migration/update_large_table'
require_relative 'cop/project_path_helper' require_relative 'cop/project_path_helper'
require_relative 'cop/rspec/env_assignment' require_relative 'cop/rspec/env_assignment'
require_relative 'cop/rspec/single_line_hook'
require_relative 'cop/rspec/verbose_include_metadata'
require_relative 'cop/sidekiq_options_queue' require_relative 'cop/sidekiq_options_queue'
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