diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-11-18 00:08:47 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-11-18 01:01:53 +0800 |
| commit | ffec300b9495f0fe022e777c889407433217497e (patch) | |
| tree | 4686a2cac35cbaa565405bfcd7615c157d8faf14 /rubocop | |
| parent | 7441c7af9acb849ba5f6a25895614fe5cc8023b2 (diff) | |
| download | gitlab-ce-ffec300b9495f0fe022e777c889407433217497e.tar.gz | |
Remove codes from bad merge
Diffstat (limited to 'rubocop')
| -rw-r--r-- | rubocop/rubocop.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb index 7db56349cd7..65a37f578cd 100644 --- a/rubocop/rubocop.rb +++ b/rubocop/rubocop.rb @@ -5,8 +5,6 @@ require_relative 'cop/gem_fetcher' require_relative 'cop/in_batches' require_relative 'cop/polymorphic_associations' require_relative 'cop/project_path_helper' -require_relative 'cop/active_record_dependent' -require_relative 'cop/in_batches' require_relative 'cop/module_with_instance_variables' require_relative 'cop/redirect_with_status' require_relative 'cop/migration/add_column' |