Merge remote-tracking branch 'gh/master' into sasl-fix

ruby-ldap · Aug 26, 2016 · 944ea47 · 944ea47
2 parents 4ea3982 + e4c46a2
commit 944ea47
Show file tree

Hide file tree

Showing 22 changed files with 906 additions and 238 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -13,5 +13,8 @@ Lint/AssignmentInCondition:
 Style/ParallelAssignment:
   Enabled: false
 
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: comma