diff --git a/.rubocop.yml b/.rubocop.yml index 98fbf51..1df5f38 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,92 +4,5 @@ inherit_from: .rubocop_todo.yml AllCops: NewCops: enable -# Offense count: 138 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline. -# SupportedStyles: single_quotes, double_quotes -Style/StringLiterals: - Enabled: true - EnforcedStyle: double_quotes - -# Offense count: 4 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyle. -# SupportedStyles: leading, trailing -Layout/DotPosition: - Enabled: true - -# Offense count: 2 -# This cop supports safe autocorrection (--autocorrect). -Layout/EmptyLines: - Enabled: true - -# Offense count: 20 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyle. -# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only -Layout/EmptyLinesAroundClassBody: - Enabled: true - -# Offense count: 6 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyle. -# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines -Layout/EmptyLinesAroundModuleBody: - Enabled: true - -# Offense count: 53 -# This cop supports safe autocorrection (--autocorrect). -Layout/SpaceAfterColon: - Enabled: true - -# Offense count: 2 -# This cop supports safe autocorrection (--autocorrect). -Layout/EmptyLineAfterGuardClause: - Enabled: true - -# Offense count: 1 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyle. -# SupportedStyles: around, only_before -Layout/EmptyLinesAroundAccessModifier: - Enabled: true - -Layout/EmptyLinesAroundBlockBody: - Enabled: true - -# Offense count: 6 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle. -# SupportedHashRocketStyles: key, separator, table -# SupportedColonStyles: key, separator, table -# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit -Layout/HashAlignment: - Enabled: true - -# Offense count: 13 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyle. -# SupportedStyles: normal, indented_internal_methods -Layout/IndentationConsistency: - Enabled: true - -Layout/SpaceBeforeBlockBraces: - Enabled: true - -Layout/EmptyLinesAroundMethodBody: - Enabled: true - -Style/PercentLiteralDelimiters: - Enabled: true - Style/RedundantReturn: Enabled: false - -Style/TrailingCommaInArrayLiteral: - Enabled: true - EnforcedStyleForMultiline: consistent_comma - -Style/TrailingCommaInHashLiteral: - Enabled: true - EnforcedStyleForMultiline: consistent_comma diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb index eb0921e..9cfb71c 100644 --- a/app/controllers/admin/events_controller.rb +++ b/app/controllers/admin/events_controller.rb @@ -12,7 +12,7 @@ def index format.json { render json: { total: @events_count, - rows: @events, + rows: @events } } end @@ -42,7 +42,7 @@ def send_events_csv(events) event.http_accept, event.http_accept_encoding, event.http_accept_language, - event.params, + event.params ] csv << column_values end diff --git a/app/controllers/admin/people_controller.rb b/app/controllers/admin/people_controller.rb index e941691..acce3b9 100644 --- a/app/controllers/admin/people_controller.rb +++ b/app/controllers/admin/people_controller.rb @@ -23,7 +23,7 @@ def index format.json { render json: { total: @records.size, - rows: @records, + rows: @records } } end diff --git a/app/models/event.rb b/app/models/event.rb index 7db791a..0af4742 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -22,7 +22,7 @@ def self.log(params, request) http_accept: request.accept, http_accept_encoding: request.accept_encoding, http_accept_language: request.accept_language, - params: params.to_json, + params: params.to_json } Event.create(event) end diff --git a/config/initializers/dartsass.rb b/config/initializers/dartsass.rb index 2c18db2..0759dc1 100644 --- a/config/initializers/dartsass.rb +++ b/config/initializers/dartsass.rb @@ -1,5 +1,5 @@ Rails.application.config.dartsass.builds = { "admin.scss" => "admin.css", - "fishing.scss" => "fishing.css", + "fishing.scss" => "fishing.css" } Rails.application.config.dartsass.build_options << "--no-charset" << "--quiet-deps" diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb index ee2ed8c..c0b717f 100644 --- a/config/initializers/filter_parameter_logging.rb +++ b/config/initializers/filter_parameter_logging.rb @@ -4,5 +4,5 @@ # Use this to limit dissemination of sensitive information. # See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors. Rails.application.config.filter_parameters += [ - :passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :cvv, :cvc, + :passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :cvv, :cvc ]