From 634a1f2748b1f76e9549c8c00f0fd7101c46a6cb Mon Sep 17 00:00:00 2001 From: Jon Maciel Date: Wed, 6 Nov 2019 16:55:37 -0300 Subject: [PATCH 1/2] Fixe rubocop file --- .rubocop.yml | 4 ++ .rubocop_todo.yml | 97 ----------------------------------------------- 2 files changed, 4 insertions(+), 97 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 2b7c683..b00e65c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -23,3 +23,7 @@ Metrics/BlockLength: Layout/EmptyLineAfterMagicComment: Exclude: - 'app/models/**/*.rb' + +Bundler/OrderedGems: + Exclude: + - 'Gemfile' diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 41ed3b2..b700a15 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -2,81 +2,17 @@ Bundler/OrderedGems: Exclude: - 'Gemfile' -Layout/IndentFirstArrayElement: - Exclude: - -Layout/CaseIndentation: - Exclude: - - 'app/helpers/application_helper.rb' - -Layout/ClosingParenthesisIndentation: - Exclude: - -Layout/DefEndAlignment: - Exclude: - -Layout/EmptyLineBetweenDefs: - Exclude: - - 'app/helpers/application_helper.rb' - -Layout/EmptyLines: - Exclude: - - 'app/helpers/application_helper.rb' Layout/EmptyLinesAroundBlockBody: Enabled: false -Layout/EmptyLinesAroundClassBody: - Exclude: - -Layout/EmptyLinesAroundModuleBody: - Exclude: - - 'app/helpers/application_helper.rb' - -Layout/EndAlignment: - Exclude: - - 'app/helpers/application_helper.rb' - -Layout/ExtraSpacing: - Exclude: - Layout/MultilineMethodCallIndentation: Enabled: false -Layout/SpaceAroundEqualsInParameterDefault: - Exclude: - - 'app/helpers/application_helper.rb' - -Layout/SpaceBeforeBlockBraces: - Exclude: - - 'app/helpers/application_helper.rb' - -Layout/SpaceInsideHashLiteralBraces: - Exclude: - -Layout/TrailingWhitespace: - Exclude: - Lint/AmbiguousBlockAssociation: Exclude: - 'test.ruby' -Lint/AmbiguousOperator: - Exclude: - -Lint/BooleanSymbol: - Exclude: - -Lint/HandleExceptions: - Exclude: - -Lint/ParenthesesAsGroupedExpression: - Exclude: - -Lint/UselessAssignment: - Exclude: - - 'app/helpers/application_helper.rb' - Metrics/AbcSize: Max: 161 @@ -98,12 +34,6 @@ Metrics/ModuleLength: Metrics/PerceivedComplexity: Max: 31 -Naming/AccessorMethodName: - Exclude: - -Naming/MemoizedInstanceVariableName: - Exclude: - Naming/PredicateName: Exclude: - 'spec/**/*' @@ -132,17 +62,6 @@ Style/DateTime: Style/Documentation: Enabled: false -Style/DoubleNegation: - Exclude: - - 'app/controllers/application_controller.rb' - -Style/EmptyMethod: - Exclude: - -Style/FormatString: - Exclude: - - 'app/helpers/application_helper.rb' - Style/GuardClause: Enabled: false @@ -165,28 +84,12 @@ Style/NumericPredicate: Exclude: - 'spec/**/*' -Style/PercentLiteralDelimiters: - Exclude: - - 'app/helpers/application_helper.rb' - Style/StringLiterals: Enabled: false Style/SymbolArray: Exclude: -Style/SymbolProc: - Exclude: - - 'app/helpers/application_helper.rb' - -Style/TrailingCommaInArguments: - Exclude: - - 'spec/forms/revoke_responsible_seller_spec.rb' - -Style/UnneededInterpolation: - Exclude: - - 'app/helpers/application_helper.rb' - Style/WordArray: Exclude: From 756300936e0dfba46fecc7311803230145a6b5a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2019 19:57:10 +0000 Subject: [PATCH 2/2] Bump loofah from 2.2.3 to 2.3.1 Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.3 to 2.3.1. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.2.3...v2.3.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b97301c..230a367 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,7 +52,7 @@ GEM byebug (11.0.1) coderay (1.1.2) concurrent-ruby (1.1.5) - crass (1.0.4) + crass (1.0.5) database_cleaner (1.7.0) diff-lcs (1.3) erubi (1.8.0) @@ -76,7 +76,7 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.2.3) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -90,7 +90,7 @@ GEM minitest (5.11.3) msgpack (1.2.9) nio4r (2.3.1) - nokogiri (1.10.2) + nokogiri (1.10.5) mini_portile2 (~> 2.4.0) pg (1.1.4) pry (0.12.2)