diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-12-26 16:30:36 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-12-26 16:30:36 +0800 |
| commit | cc7a7aad80d9c5b8c03b12c3b961c2eadaab920c (patch) | |
| tree | 8ac987730f35c85c521636d08b91671d3d03b46e | |
| parent | 29749f92b7f86d45af41509262601e47ee848d92 (diff) | |
| download | gitlab-ce-cc7a7aad80d9c5b8c03b12c3b961c2eadaab920c.tar.gz | |
Require our own custom cops; Remove missing cops41480-require-custom-cops
Also try to use the same config from EE
| -rw-r--r-- | .rubocop.yml | 3 | ||||
| -rw-r--r-- | rubocop/rubocop.rb | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 0199bb9683a..9adc2fae7a8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -3,6 +3,7 @@ inherit_gem: - rubocop-default.yml inherit_from: .rubocop_todo.yml +require: ./rubocop/rubocop AllCops: TargetRailsVersion: 4.2 @@ -24,8 +25,10 @@ Gitlab/ModuleWithInstanceVariables: Exclude: # We ignore Rails helpers right now because it's hard to workaround it - app/helpers/**/*_helper.rb + - ee/app/helpers/**/*_helper.rb # We ignore Rails mailers right now because it's hard to workaround it - app/mailers/emails/**/*.rb + - ee/**/emails/**/*.rb # We ignore spec helpers because it usually doesn't matter - spec/support/**/*.rb - features/steps/**/*.rb diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb index 26087f15984..2f63babc425 100644 --- a/rubocop/rubocop.rb +++ b/rubocop/rubocop.rb @@ -1,4 +1,3 @@ -require_relative 'cop/active_record_dependent' require_relative 'cop/gitlab/module_with_instance_variables' require_relative 'cop/include_sidekiq_worker' require_relative 'cop/migration/add_column' @@ -18,6 +17,4 @@ require_relative 'cop/migration/update_column_in_batches' require_relative 'cop/migration/update_large_table' require_relative 'cop/project_path_helper' 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' |