diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 00:08:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 00:08:37 +0300 |
| commit | bbaf2bb0438b1c71020d9d216feb528add225a7f (patch) | |
| tree | 47409ddbb4994ec78c24503416ab44f129f39ec6 /.rubocop.yml | |
| parent | e9c2bf267862e22c0770cc7b3a1ed97a8b87a7fd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index c8e4fc6b305..2833d31986b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -331,26 +331,13 @@ RSpec/MissingExampleGroupArgument: RSpec/UnspecifiedException: Enabled: false -# Work in progress. See https://gitlab.com/gitlab-org/gitlab/issues/196163 RSpec/HaveGitlabHttpStatus: Enabled: true Exclude: - 'spec/support/matchers/have_gitlab_http_status.rb' Include: - - 'spec/support/**/*' - - 'ee/spec/support/**/*' - - 'spec/features/**/*' - - 'ee/spec/features/**/*' - - 'spec/controllers/**/*' - - 'ee/spec/controllers/**/*' - - 'spec/requests/*.rb' - - 'ee/spec/requests/*.rb' - - 'spec/requests/{groups,projects,repositories}/**/*' - - 'ee/spec/requests/{groups,projects,repositories}/**/*' - - 'spec/requests/api/*/**/*.rb' - - 'ee/spec/requests/api/*/**/*.rb' - - 'spec/requests/api/[a-s]*.rb' - - 'ee/spec/requests/api/[a-s]*.rb' + - 'spec/**/*' + - 'ee/spec/**/*' Style/MultilineWhenThen: Enabled: false |