1 files changed, 30 insertions, 6 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index dd8db6af3a..fbca606605 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,24 +4,48 @@ AllCops:
 
 # Two spaces, no tabs (for indentation).
 Style/IndentationWidth:
-  enabled: true
+  Enabled: true
 
 # No trailing whitespace.
 Style/TrailingWhitespace:
-  enabled: true
+  Enabled: true
 
 # Blank lines should not have any spaces.
 Style/TrailingBlankLines:
-  enabled: true
+  Enabled: true
 
 # Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
 Style/HashSyntax:
-  enabled: true
+  Enabled: true
 
 # Prefer &&/|| over and/or.
 Style/AndOr:
-  enabled: true
+  Enabled: true
 
 # Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
 Lint/RequireParentheses:
-  enabled: true
+  Enabled: true
+
+# Do not use braces for hash literals when they are the last argument of a
+# method call.
+Style/BracesAroundHashParameters:
+  Enabled: true
+
+# Method definitions after `private` or `protected` isolated calls need one
+# extra level of indentation.
+Style/IndentationConsistency:
+  Enabled: true
+  EnforcedStyle: rails
+
+# In a regular class definition, no empty lines around the body.
+Style/EmptyLinesAroundClassBody:
+  Enabled: true
+
+# In a regular module definition, no empty lines around the body.
+Style/EmptyLinesAroundModuleBody:
+  Enabled: true
+
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Lint/EndAlignment:
+  AlignWith: variable