summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-05-23 14:03:04 -0400
committerRobert Speicher <rspeicher@gmail.com>2016-05-23 14:03:04 -0400
commit6898087b97234516b1d31ac731653bebbd9a171e (patch)
tree99bdbc2b2c921cef7bab6cf5436df470d28d3067 /.rubocop.yml
parent68b8e86a813608ae378b39ba5a64ff07fb9a057a (diff)
downloadgitlab-ce-6898087b97234516b1d31ac731653bebbd9a171e.tar.gz
Update rubocop to 0.40.0
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml18
1 files changed, 18 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 0946ef5d848..81ab2e8143b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -333,6 +333,12 @@ Style/MethodName:
Style/ModuleFunction:
Enabled: false
+# Checks that the closing brace in an array literal is either on the same line
+# as the last array element, or a new line.
+Style/MultilineArrayBraceLayout:
+ Enabled: false
+ EnforcedStyle: symmetrical
+
# Avoid multi-line chains of blocks.
Style/MultilineBlockChain:
Enabled: false
@@ -341,10 +347,22 @@ Style/MultilineBlockChain:
Style/MultilineBlockLayout:
Enabled: true
+# Checks that the closing brace in a hash literal is either on the same line as
+# the last hash element, or a new line.
+Style/MultilineHashBraceLayout:
+ Enabled: false
+ EnforcedStyle: symmetrical
+
# Do not use then for multi-line if/unless.
Style/MultilineIfThen:
Enabled: false
+# Checks that the closing brace in a method call is either on the same line as
+# the last method argument, or a new line.
+Style/MultilineMethodCallBraceLayout:
+ Enabled: false
+ EnforcedStyle: symmetrical
+
# Checks indentation of method calls with the dot operator that span more than
# one line.
Style/MultilineMethodCallIndentation: