logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: cb7ee4698f2a62e15da0db2a5def866615aab57e
parent: d010e270e613f6299397601289158bd2acedbe8e
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Thu,  1 Jun 2017 11:24:30 -0400

Rubocop changes (#3501)

* Update renamed rubocop configuration options

* Remove duplicate rubocop configuration, sort options

Diffstat:

M.rubocop.yml84+++++++++++++++++++++++++++++++++++++------------------------------------------
1 file changed, 39 insertions(+), 45 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml @@ -1,22 +1,24 @@ -Rails: - Enabled: true - -Style/PerlBackrefs: - AutoCorrect: false +AllCops: + TargetRubyVersion: 2.3 + Exclude: + - 'spec/**/*' + - 'db/**/*' + - 'app/views/**/*' + - 'config/**/*' + - 'bin/*' + - 'Rakefile' + - 'node_modules/**/*' + - 'Vagrantfile' + - 'vendor/**/*' -Style/ClassAndModuleChildren: +Bundler/OrderedGems: Enabled: false -Metrics/BlockNesting: - Max: 2 - -Metrics/LineLength: - AllowURI: true - Enabled: false +Layout/AccessModifierIndentation: + EnforcedStyle: indent -Metrics/MethodLength: - CountComments: false - Max: 10 +Layout/SpaceInsideHashLiteralBraces: + EnforcedStyle: space Metrics/AbcSize: Max: 100 @@ -31,22 +33,33 @@ Metrics/ClassLength: Metrics/CyclomaticComplexity: Max: 15 +Metrics/LineLength: + AllowURI: true + Enabled: false + Metrics/MethodLength: + CountComments: false Max: 55 Metrics/ModuleLength: CountComments: false Max: 200 -Metrics/PerceivedComplexity: - Max: 10 - Metrics/ParameterLists: Max: 4 CountKeywordArgs: true -Style/AccessModifierIndentation: - EnforcedStyle: indent +Metrics/PerceivedComplexity: + Max: 10 + +Rails: + Enabled: true + +Rails/HasAndBelongsToMany: + Enabled: false + +Style/ClassAndModuleChildren: + Enabled: false Style/CollectionMethods: Enabled: true @@ -62,36 +75,17 @@ Style/DoubleNegation: Style/FrozenStringLiteralComment: Enabled: true -Style/SpaceInsideHashLiteralBraces: - EnforcedStyle: space - -Style/TrailingCommaInLiteral: - EnforcedStyleForMultiline: 'comma' - -Style/RegexpLiteral: +Style/GuardClause: Enabled: false Style/Lambda: Enabled: false -Style/GuardClause: - Enabled: false - -Rails/HasAndBelongsToMany: - Enabled: false +Style/PerlBackrefs: + AutoCorrect: false -Bundler/OrderedGems: +Style/RegexpLiteral: Enabled: false -AllCops: - TargetRubyVersion: 2.3 - Exclude: - - 'spec/**/*' - - 'db/**/*' - - 'app/views/**/*' - - 'config/**/*' - - 'bin/*' - - 'Rakefile' - - 'node_modules/**/*' - - 'Vagrantfile' - - 'vendor/**/*' +Style/TrailingCommaInLiteral: + EnforcedStyleForMultiline: 'comma'