Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update nokogiri #3910

Merged
merged 2 commits into from
Sep 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/api/.rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ AllCops:
UseCache: true
CacheRootDirectory: tmp/rubocop_cache
MaxFilesInCache: 2000
TargetRubyVersion: 2.4
Exclude:
- 'tmp/**/*'
- 'lib/templates/**/*'
Expand Down
98 changes: 60 additions & 38 deletions src/api/.rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2017-02-01 10:21:02 +0100 using RuboCop version 0.47.1.
# on 2017-09-27 08:02:19 +0200 using RuboCop version 0.47.1.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down Expand Up @@ -66,7 +66,7 @@ Lint/ParenthesesAsGroupedExpression:
- 'test/functional/webui/maintenance_workflow_test.rb'
- 'test/functional/webui/monitor_controller_test.rb'

# Offense count: 10
# Offense count: 9
Lint/RescueException:
Exclude:
- 'app/controllers/person_controller.rb'
Expand All @@ -91,11 +91,11 @@ Lint/UnderscorePrefixedVariableName:
- 'app/models/event/base.rb'
- 'lib/api_exception.rb'

# Offense count: 1016
# Offense count: 1014
Metrics/AbcSize:
Max: 262

# Offense count: 194
# Offense count: 225
# Configuration parameters: CountComments, ExcludedMethods.
Metrics/BlockLength:
Max: 909
Expand All @@ -108,13 +108,13 @@ Metrics/BlockNesting:
# Offense count: 104
# Configuration parameters: CountComments.
Metrics/ClassLength:
Max: 1440
Max: 1485

# Offense count: 251
# Offense count: 247
Metrics/CyclomaticComplexity:
Max: 55

# Offense count: 1094
# Offense count: 1093
# Configuration parameters: CountComments.
Metrics/MethodLength:
Max: 264
Expand All @@ -129,7 +129,7 @@ Metrics/ModuleLength:
Metrics/ParameterLists:
Max: 9

# Offense count: 217
# Offense count: 216
Metrics/PerceivedComplexity:
Max: 55

Expand All @@ -139,7 +139,12 @@ Performance/CompareWithBlock:
Exclude:
- 'app/controllers/webui/project_controller.rb'

# Offense count: 604
# Offense count: 60
# Cop supports --auto-correct.
Performance/RegexpMatch:
Enabled: false

# Offense count: 609
# Cop supports --auto-correct.
# Configuration parameters: Whitelist.
# Whitelist: find_by_sql
Expand Down Expand Up @@ -205,7 +210,7 @@ Rails/NotNullColumn:
- 'db/migrate/20131027122410_add_primary_to_repository_architectures.rb'
- 'db/migrate/20131209103450_add_primary_to_groups_users.rb'

# Offense count: 38
# Offense count: 37
# Configuration parameters: Include.
# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
Rails/Output:
Expand Down Expand Up @@ -281,7 +286,7 @@ Rails/SkipsModelValidations:
- 'spec/models/review_spec.rb'
- 'test/unit/event_mailer_test.rb'

# Offense count: 78
# Offense count: 80
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: strict, flexible
Rails/TimeZone:
Expand Down Expand Up @@ -329,7 +334,7 @@ Style/AlignArray:
- 'lib/xpath_engine.rb'
- 'test/functional/source_controller_test.rb'

# Offense count: 78
# Offense count: 86
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
# SupportedStyles: line_count_based, semantic, braces_for_chaining
Expand All @@ -339,14 +344,14 @@ Style/AlignArray:
Style/BlockDelimiters:
Enabled: false

# Offense count: 156
# Offense count: 193
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: braces, no_braces, context_dependent
Style/BracesAroundHashParameters:
Enabled: false

# Offense count: 79
# Offense count: 73
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, IndentOneStep, IndentationWidth.
# SupportedStyles: case, end
Expand All @@ -360,12 +365,11 @@ Style/CaseIndentation:
- 'app/models/bs_request.rb'
- 'app/models/bs_request_permission_check.rb'
- 'app/models/cache_line.rb'
- 'app/models/user_ldap_strategy.rb'
- 'db/migrate/20140908125426_convert_request_history.rb'
- 'lib/opensuse/backend.rb'
- 'lib/opensuse/validator.rb'

# Offense count: 110
# Offense count: 111
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: nested, compact
Style/ClassAndModuleChildren:
Expand All @@ -378,7 +382,7 @@ Style/ClassAndModuleChildren:
Style/ClassCheck:
Enabled: false

# Offense count: 48
# Offense count: 44
Style/ClassVars:
Exclude:
- 'app/controllers/test_controller.rb'
Expand All @@ -398,7 +402,7 @@ Style/ClosingParenthesisIndentation:
Exclude:
- 'test/unit/project_test.rb'

# Offense count: 14
# Offense count: 13
# Cop supports --auto-correct.
Style/ColonMethodCall:
Exclude:
Expand Down Expand Up @@ -430,12 +434,12 @@ Style/CommentAnnotation:
- 'test/functional/build_controller_test.rb'
- 'test/functional/request_controller_test.rb'

# Offense count: 59
# Offense count: 58
# Cop supports --auto-correct.
Style/CommentIndentation:
Enabled: false

# Offense count: 94
# Offense count: 92
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly, IncludeTernaryExpressions.
# SupportedStyles: assign_to_condition, assign_inside_condition
Expand All @@ -451,7 +455,7 @@ Style/ConstantName:
- 'app/models/event/request.rb'
- 'test/unit/issue_test.rb'

# Offense count: 523
# Offense count: 531
Style/Documentation:
Enabled: false

Expand All @@ -462,12 +466,12 @@ Style/Documentation:
Style/DotPosition:
Enabled: false

# Offense count: 153
# Offense count: 144
# Cop supports --auto-correct.
Style/EmptyLiteral:
Enabled: false

# Offense count: 29
# Offense count: 30
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: compact, expanded
Expand Down Expand Up @@ -497,14 +501,13 @@ Style/FirstParameterIndentation:
- 'test/unit/package_test.rb'
- 'test/unit/project_test.rb'

# Offense count: 13
# Offense count: 11
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: for, each
Style/For:
Exclude:
- 'app/models/bs_request_action_maintenance_release.rb'
- 'app/models/project.rb'
- 'app/models/user_ldap_strategy.rb'
- 'db/attribute_descriptions.rb'
- 'db/migrate/20130301100000_add_release_target_constraints.rb'
- 'test/functional/attributes_test.rb'
Expand All @@ -525,6 +528,13 @@ Style/FormatString:
- 'app/models/product.rb'
- 'config/initializers/logging.rb'

# Offense count: 736
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: when_needed, always, never
Style/FrozenStringLiteralComment:
Enabled: false

# Offense count: 7
# Configuration parameters: AllowedVariables.
Style/GlobalVars:
Expand All @@ -533,7 +543,7 @@ Style/GlobalVars:
- 'test/functional/request_controller_test.rb'
- 'test/functional/source_controller_test.rb'

# Offense count: 151
# Offense count: 153
# Configuration parameters: MinBodyLength.
Style/GuardClause:
Enabled: false
Expand All @@ -545,13 +555,13 @@ Style/IdenticalConditionalBranches:
- 'app/controllers/webui/package_controller.rb'
- 'app/controllers/webui/search_controller.rb'

# Offense count: 183
# Offense count: 181
# Cop supports --auto-correct.
# Configuration parameters: MaxLineLength.
Style/IfUnlessModifier:
Enabled: false

# Offense count: 91
# Offense count: 105
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
# SupportedStyles: special_inside_parentheses, consistent, align_braces
Expand All @@ -572,7 +582,7 @@ Style/IndentationConsistency:
- 'test/functional/webui/package_create_test.rb'
- 'test/unit/ichain_notifier_test.rb'

# Offense count: 57
# Offense count: 56
# Cop supports --auto-correct.
Style/LineEndConcatenation:
Enabled: false
Expand Down Expand Up @@ -677,7 +687,7 @@ Style/NegatedWhile:
- 'lib/xpath_engine.rb'
- 'script/start_test_backend'

# Offense count: 28
# Offense count: 29
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
# SupportedStyles: skip_modifier_ifs, always
Expand All @@ -689,6 +699,13 @@ Style/Next:
Style/NumericLiterals:
MinDigits: 7

# Offense count: 45
# Cop supports --auto-correct.
# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
# SupportedStyles: predicate, comparison
Style/NumericPredicate:
Enabled: false

# Offense count: 8
# Cop supports --auto-correct.
Style/ParallelAssignment:
Expand Down Expand Up @@ -762,7 +779,7 @@ Style/PredicateName:
- 'app/models/user_ldap_strategy.rb'
- 'lib/activexml/node.rb'

# Offense count: 122
# Offense count: 112
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: short, verbose
Expand Down Expand Up @@ -838,6 +855,12 @@ Style/RescueModifier:
- 'app/controllers/webui/project_controller.rb'
- 'test/functional/webui/owner_search_test.rb'

# Offense count: 39
# Cop supports --auto-correct.
# Configuration parameters: ConvertCodeThatCanStartToReturnNil.
Style/SafeNavigation:
Enabled: false

# Offense count: 20
# Cop supports --auto-correct.
Style/SelfAssignment:
Expand Down Expand Up @@ -901,23 +924,23 @@ Style/SpaceInLambdaLiteral:
- 'app/models/package_issue.rb'
- 'config/routes.rb'

# Offense count: 136
# Offense count: 135
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
# SupportedStyles: space, no_space
# SupportedStylesForEmptyBraces: space, no_space
Style/SpaceInsideBlockBraces:
Enabled: false

# Offense count: 1482
# Offense count: 1490
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces.
# SupportedStyles: space, no_space, compact
# SupportedStylesForEmptyBraces: space, no_space
Style/SpaceInsideHashLiteralBraces:
Enabled: false

# Offense count: 1227
# Offense count: 1222
# Cop supports --auto-correct.
Style/SpaceInsideParens:
Enabled: false
Expand Down Expand Up @@ -954,7 +977,7 @@ Style/SpecialGlobalVars:
- 'lib/memory_dumper.rb'
- 'test/unit/schema_test.rb'

# Offense count: 8663
# Offense count: 8712
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
# SupportedStyles: single_quotes, double_quotes
Expand Down Expand Up @@ -1000,7 +1023,7 @@ Style/TrivialAccessors:
- 'lib/activexml/node.rb'
- 'test/test_helper.rb'

# Offense count: 29
# Offense count: 28
# Cop supports --auto-correct.
Style/UnneededInterpolation:
Exclude:
Expand All @@ -1012,7 +1035,6 @@ Style/UnneededInterpolation:
- 'app/helpers/webui/patchinfo_helper.rb'
- 'app/mixins/build_log_support.rb'
- 'app/models/branch_package.rb'
- 'app/models/user_ldap_strategy.rb'
- 'lib/opensuse/backend.rb'
- 'spec/features/webui/projects_spec.rb'
- 'test/functional/branch_publish_flag_test.rb'
Expand All @@ -1034,7 +1056,7 @@ Style/VariableNumber:
- 'spec/features/webui/projects_spec.rb'
- 'test/unit/project_test.rb'

# Offense count: 34
# Offense count: 41
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, MinSize, WordRegex.
# SupportedStyles: percent, brackets
Expand Down
2 changes: 1 addition & 1 deletion src/api/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gem 'rails', '~> 5.0.1'
# as our database
gem 'mysql2'
# as requirement for activexml
gem 'nokogiri', '~>1.7.0.1'
gem 'nokogiri', '~>1.8.1'
# for delayed tasks
gem 'delayed_job_active_record', '>= 4.0.0'
# to fill errbit
Expand Down
Loading