diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-04-06 13:40:30 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-04-06 13:40:30 +0000 |
| commit | 88f33a1266ca51d48272e858c399daedd837575f (patch) | |
| tree | 9c0da433d01a0cf01cdc0ded774c8b85a949403f /rubocop/rubocop.rb | |
| parent | b3ea598b1aeaf7f3eb0071b60f97247ad67e69f4 (diff) | |
| parent | 8199ff7bd71ce91fbc945b2c31010fcf654bda67 (diff) | |
| download | gitlab-ce-update-trace-handling-code.tar.gz | |
Merge branch 'master' into 'update-trace-handling-code'update-trace-handling-code
# Conflicts:
# app/assets/javascripts/build.js
Diffstat (limited to 'rubocop/rubocop.rb')
| -rw-r--r-- | rubocop/rubocop.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb index a50a522cf9d..d580aa6857a 100644 --- a/rubocop/rubocop.rb +++ b/rubocop/rubocop.rb @@ -5,3 +5,5 @@ require_relative 'cop/migration/add_column_with_default' require_relative 'cop/migration/add_concurrent_foreign_key' require_relative 'cop/migration/add_concurrent_index' require_relative 'cop/migration/add_index' +require_relative 'cop/migration/remove_concurrent_index' +require_relative 'cop/migration/remove_index' |