Fix indentation in conditionals

This commit is contained in:
Jared Beck 2016-03-05 17:30:53 -05:00
parent b27f0cd925
commit 6e2fd6130e
4 changed files with 8 additions and 16 deletions

View File

@ -48,6 +48,12 @@ Style/DoubleNegation:
Style/LineEndConcatenation:
Enabled: false
Style/MultilineMethodCallIndentation:
EnforcedStyle: indented
Style/MultilineOperationIndentation:
EnforcedStyle: indented
Style/PredicateName:
NameWhitelist: has_paper_trail

View File

@ -140,20 +140,6 @@ Style/MultilineBlockLayout:
Exclude:
- 'test/unit/model_test.rb'
# Offense count: 23
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
# SupportedStyles: aligned, indented
Style/MultilineMethodCallIndentation:
Enabled: false
# Offense count: 3
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
# SupportedStyles: aligned, indented
Style/MultilineOperationIndentation:
Enabled: false
# Offense count: 4
Style/MultilineTernaryOperator:
Exclude:

View File

@ -121,7 +121,7 @@ module PaperTrail
end
if recording_order == "after" &&
Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("5")
Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("5")
if ::ActiveRecord::Base.belongs_to_required_by_default
::ActiveSupport::Deprecation.warn(
"paper_trail_on_destroy(:after) is incompatible with ActiveRecord " +

View File

@ -24,7 +24,7 @@ module PaperTrail
def where_object_changes_condition(arel_field, field, value)
# Need to check first (before) and secondary (after) fields
if (defined?(::YAML::ENGINE) && ::YAML::ENGINE.yamler == "psych") ||
(defined?(::Psych) && ::YAML == ::Psych)
(defined?(::Psych) && ::YAML == ::Psych)
arel_field.matches("%\n#{field}:\n- #{value}\n%").
or(arel_field.matches("%\n#{field}:\n-%\n- #{value}\n%"))
else # Syck adds extra spaces into array dumps