Skip to content

Commit

Permalink
Merge branch '7.2.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
cheerfulstoic committed Jun 16, 2017
2 parents fd92960 + 1156116 commit 255a773
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ Style/HashSyntax:
Enabled: true
EnforcedStyle: ruby19

Style/SpaceInsideHashLiteralBraces:
Layout/SpaceInsideHashLiteralBraces:
Enabled: true
EnforcedStyle: no_space

Style/SpaceAroundOperators:
Layout/SpaceAroundOperators:
AllowForAlignment: true

# Offense count: 7
Expand Down Expand Up @@ -52,7 +52,7 @@ Style/SignalException:

# Cop supports --auto-correct.
# Reason: Double spaces can be useful for grouping code
Style/EmptyLines:
Layout/EmptyLines:
Enabled: false

# Cop supports --auto-correct.
Expand Down

0 comments on commit 255a773

Please sign in to comment.