diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-06 00:08:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-06 00:08:27 +0300 |
| commit | 908a54b62497377af7b0e307197b2ea930dbc4f0 (patch) | |
| tree | 311261a02ca8583a7d1835b4e0d198b8ac1b320e /.rubocop.yml | |
| parent | aee8d27430f12f9b5bcdbbee4165b9fbc240d3e3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 356d6e5f013..f9e92340afa 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,11 +2,14 @@ inherit_gem: gitlab-styles: - rubocop-default.yml -inherit_from: .rubocop_todo.yml require: - ./rubocop/rubocop - rubocop-rspec +inherit_from: + - .rubocop_todo.yml + - ./rubocop/rubocop-migrations.yml + inherit_mode: merge: - Include |