summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-05-30 17:47:59 +0000
committerRobert Speicher <robert@gitlab.com>2016-05-30 17:47:59 +0000
commit7a6d069f419d796acafe8caa203385f510ca94ca (patch)
tree793e061b90c835771815cb559e2727a257352fea /.rubocop.yml
parent1a59b350d84b661af3ebf41ca4c034f29157d92b (diff)
parent7ee9b8e758cb4557afb083b78e56b39f16c0dc57 (diff)
downloadgitlab-ce-7a6d069f419d796acafe8caa203385f510ca94ca.tar.gz
Merge branch 'style/enable-multiline-if-then-rubocop-cop' into 'master'
Enable Style/MultilineIfThen rubocop cop Do not use then for multi-line if. See #7478. See merge request !4353
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index e884cfd8ed3..79f32eedee6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -362,7 +362,7 @@ Style/MultilineHashBraceLayout:
# Do not use then for multi-line if/unless.
Style/MultilineIfThen:
- Enabled: false
+ Enabled: true
# Checks that the closing brace in a method call is either on the same line as
# the last method argument, or a new line.