diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-08-08 17:50:22 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-08-08 17:50:22 +0000 |
commit | a77394a7e526b462057c0ef88e5b8b06b96e2290 (patch) | |
tree | 99635227d1ae1adcffd3ae2cb43019c937caec3a /.rubocop.yml | |
parent | 15b1bf845b7a05b05e4e7b1d41ace829ae48f1dc (diff) | |
parent | 5f6223cf9f285da3814991d1271e328e23be9d45 (diff) | |
download | gitlab-ce-a77394a7e526b462057c0ef88e5b8b06b96e2290.tar.gz |
Merge branch 'rubocop/EmptyLinesAroundModuleBody' into 'master'
Enable Style/EmptyLinesAround Module/Class Body cop
## What does this MR do?
Enable a new rubocop cops as discussed here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1877/diffs#note_13021078
## Are there points in the code the reviewer needs to double check?
May be a good idea to send a message to people to prevent `master` red because of the new cop.
## Why was this MR needed?
We want to improve code style and not waste endbosses time checking style manually
## What are the relevant issue numbers?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5692
Diffstat (limited to '.rubocop.yml')
-rw-r--r-- | .rubocop.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 01976bfbe04..4727daa0545 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -153,11 +153,11 @@ Style/EmptyLinesAroundBlockBody: # Keeps track of empty lines around class bodies. Style/EmptyLinesAroundClassBody: - Enabled: false + Enabled: true # Keeps track of empty lines around module bodies. Style/EmptyLinesAroundModuleBody: - Enabled: false + Enabled: true # Keeps track of empty lines around method bodies. Style/EmptyLinesAroundMethodBody: |