Skip to content

Commit

Permalink
Merge pull request #2966 from bitzesty/main
Browse files Browse the repository at this point in the history
Staging < main
  • Loading branch information
TheDancingClown authored Jun 17, 2024
2 parents 1f1dcfd + 3903fb3 commit 18ab582
Show file tree
Hide file tree
Showing 453 changed files with 3,104 additions and 4,472 deletions.
14 changes: 14 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
# @see http://editorconfig.org
root = true

[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = spaces
tab_width = 2

[*.{rb,rake,erb,slim,js,ts,coffee,json,yml,css,pcss,scss,sh,markdown,md,html}]
indent_size = 2
58 changes: 44 additions & 14 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ Layout/SpaceInsideHashLiteralBraces:
Enabled: true
EnforcedStyle: space

# If we want a boolean called :true, we should allow that. These are likely not mistakes.
Lint/BooleanSymbol:
Enabled: false

Metrics/ModuleLength:
Enabled: false

Expand All @@ -92,6 +96,9 @@ Naming/VariableNumber:
Naming/MemoizedInstanceVariableName:
EnforcedStyleForLeadingUnderscores: optional

Performance/MapCompact:
Enabled: false

Rails:
Enabled: true

Expand All @@ -102,39 +109,62 @@ Rails/ApplicationRecord:
Rails/FindBy:
Enabled: false

Rails/HasManyOrHasOneDependent:
Enabled: false

Rails/Output:
Exclude:
- lib/**/*
- db/migrate/**/*.rb

Rails/SkipsModelValidations:
Exclude:
- db/migrate/**/*.rb
- spec/**/*.rb
Enabled: false

Style/HashConversion:
Rails/UnknownEnv:
Environments:
- production
- staging
- development
- test

Style/ArgumentsForwarding:
Enabled: false

Style/TrailingCommaInArrayLiteral:
EnforcedStyleForMultiline: comma
Style/Documentation:
Enabled: false

Style/TrailingCommaInHashLiteral:
EnforcedStyleForMultiline: consistent_comma
Style/EmptyMethod:
EnforcedStyle: compact

Style/TrailingCommaInArguments:
EnforcedStyleForMultiline: consistent_comma
Style/HashConversion:
Enabled: false

Style/WordArray:
MinSize: 0
Style/NumericLiteralPrefix:
Enabled: false

Style/SafeNavigation:
Enabled: false

Style/SingleLineMethods:
AllowIfMethodIsEmpty: true

Style/StringLiterals:
EnforcedStyle: double_quotes

Style/StringLiteralsInInterpolation:
EnforcedStyle: double_quotes

Style/Documentation:
Enabled: false
Style/TrailingCommaInArrayLiteral:
EnforcedStyleForMultiline: comma

Style/TrailingCommaInHashLiteral:
EnforcedStyleForMultiline: comma

Style/TrailingCommaInArguments:
EnforcedStyleForMultiline: comma

Style/WordArray:
MinSize: 0

Metrics/ClassLength:
Enabled: false
Loading

0 comments on commit 18ab582

Please sign in to comment.