diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 12:08:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 12:08:19 +0300 |
| commit | 02ab65d49fc94be7c91e511899762236c122977d (patch) | |
| tree | 4d4bf4ec54a95a0d73e039fa1410ea841156ffb2 /.rubocop.yml | |
| parent | 4411353300cf8219d2b899785bc5103c549ba8cf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 91c7aa53fb7..b65f9e8aff1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -155,11 +155,10 @@ Rails/ApplicationRecord: # as they need to be as decoupled from application code as possible - db/**/*.rb - lib/gitlab/background_migration/**/*.rb + - ee/lib/ee/gitlab/background_migration/**/*.rb - lib/gitlab/database/**/*.rb - spec/**/*.rb - ee/db/**/*.rb - - ee/lib/gitlab/background_migration/**/*.rb - - ee/lib/ee/gitlab/background_migration/**/*.rb - ee/spec/**/*.rb # GitLab ################################################################### @@ -233,7 +232,8 @@ RSpec/FactoriesInMigrationSpecs: - 'spec/migrations/**/*.rb' - 'ee/spec/migrations/**/*.rb' - 'spec/lib/gitlab/background_migration/**/*.rb' - - 'ee/spec/lib/gitlab/background_migration/**/*.rb' + - 'spec/lib/ee/gitlab/background_migration/**/*.rb' + - 'ee/spec/lib/ee/gitlab/background_migration/**/*.rb' Cop/IncludeActionViewContext: Enabled: true @@ -365,4 +365,4 @@ Style/MultilineWhenThen: Enabled: false Style/FloatDivision: - Enabled: false
\ No newline at end of file + Enabled: false |