Merge branch 'master' into 2.0.0.pre.1

komposable · Apr 9, 2018 · 46adf86 · 46adf86
2 parents 2e37739 + 85fc4e2
commit 46adf86
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -52,29 +52,29 @@ Naming/PredicateName:
 Naming/VariableName:
   Enabled: true
 
-Lint/BlockAlignment:
+Lint/DeprecatedClassMethods:
   Enabled: true
-  EnforcedStyleAlignWith: start_of_block
 
-Lint/ConditionPosition:
+Layout/AlignParameters:
   Enabled: true
 
-Lint/DefEndAlignment:
+Layout/BlockAlignment:
   Enabled: true
+  EnforcedStyleAlignWith: start_of_block
 
-Lint/DeprecatedClassMethods:
+Layout/BlockEndNewline:
   Enabled: true
 
-Layout/AlignParameters:
+Layout/CaseIndentation:
   Enabled: true
 
-Layout/BlockEndNewline:
+Layout/ClosingParenthesisIndentation:
   Enabled: true
 
-Layout/CaseIndentation:
+Layout/ConditionPosition:
   Enabled: true
 
-Layout/ClosingParenthesisIndentation:
+Layout/DefEndAlignment:
   Enabled: true
 
 Layout/DotPosition: