Skip to content

Commit

Permalink
Merge branch 'release/0.43.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
gbp committed Apr 28, 2023
2 parents 0e35c64 + a9fd74b commit b6b69d4
Show file tree
Hide file tree
Showing 852 changed files with 19,227 additions and 12,186 deletions.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,8 @@ updates:
- dependency-name: capistrano
versions:
- ">= 3.0.0"

- package-ecosystem: gitsubmodule
directory: "/"
schedule:
interval: daily
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:

jobs:
rspec:
name: Ruby ${{ matrix.ruby }} / PostgreSQL ${{ matrix.postgres }} / ${{ matrix.gemfile || 'Gemfile' }}
name: Ruby ${{ matrix.ruby }} / PostgreSQL ${{ matrix.postgres }}
runs-on: ubuntu-20.04

permissions:
Expand All @@ -24,8 +24,9 @@ jobs:
fail-fast: false
matrix:
include:
- { ruby: 2.7, postgres: 13.5 }
- { ruby: 2.7, postgres: 13.5, gemfile: 'Gemfile.rails_next' }
- { ruby: '3.0', postgres: 13.5 }
- { ruby: '3.1', postgres: 13.5 }
- { ruby: '3.2', postgres: 13.5 }

services:
postgres:
Expand All @@ -41,7 +42,6 @@ jobs:
--health-retries 5
env:
BUNDLE_GEMFILE: ${{ matrix.gemfile || 'Gemfile' }}
DATABASE_URL: postgres://postgres:postgres@localhost:5432/alaveteli_test
RAILS_ENV: test

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ jobs:
- name: Install Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.0

- name: Run RuboCop linter
uses: reviewdog/action-rubocop@v1
with:
github_token: ${{ secrets.github_token }}
rubocop_flags: -DES
rubocop_version: gemfile
rubocop_extensions: rubocop-performance:gemfile rubocop-rails:gemfile
level: warning
74 changes: 72 additions & 2 deletions .ruby-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ require:
- rubocop-rails

AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0
RubyInterpreters:
- ruby
- rake
Expand All @@ -24,6 +24,10 @@ AllCops:
- node_modules/**/*
- vendor/**/*
- ".git/**/*"
- bin/bundle
- bin/rubocop
- bin/sidekiq
- bin/sidekiqmon
DisplayCopNames: false
StyleGuideCopsOnly: false
DisabledByDefault: true
Expand Down Expand Up @@ -56,6 +60,9 @@ Gemspec/DependencyVersion:
Gemspec/DeprecatedAttributeAssignment:
Enabled: false

Gemspec/DevelopmentDependencies:
Enabled: false

Gemspec/DuplicatedAssignment:
Enabled: false

Expand Down Expand Up @@ -464,6 +471,9 @@ Lint/DuplicateHashKey:
Lint/DuplicateMagicComment:
Enabled: false

Lint/DuplicateMatchPattern:
Enabled: false

Lint/DuplicateMethods:
Enabled: true

Expand Down Expand Up @@ -773,6 +783,9 @@ Lint/UselessElseWithoutRescue:
Lint/UselessMethodDefinition:
Enabled: false

Lint/UselessRescue:
Enabled: false

Lint/UselessRuby2Keywords:
Enabled: false

Expand All @@ -799,6 +812,9 @@ Metrics/BlockNesting:
Metrics/ClassLength:
Enabled: false

Metrics/CollectionLiteralLength:
Enabled: false

Metrics/CyclomaticComplexity:
Enabled: false

Expand Down Expand Up @@ -1305,6 +1321,9 @@ Rails/RequestReferer:
Rails/RequireDependency:
Enabled: false

Rails/ResponseParsedBody:
Enabled: false

Rails/ReversibleMigration:
Enabled: false

Expand Down Expand Up @@ -1350,6 +1369,9 @@ Rails/StripHeredoc:
Rails/TableNameAssignment:
Enabled: false

Rails/ThreeStateBooleanColumn:
Enabled: false

Rails/TimeZone:
Enabled: false

Expand Down Expand Up @@ -1441,6 +1463,9 @@ Style/ArgumentsForwarding:
Style/ArrayCoercion:
Enabled: false

Style/ArrayIntersect:
Enabled: false

Style/ArrayJoin:
Enabled: true

Expand Down Expand Up @@ -1521,6 +1546,12 @@ Style/CommentAnnotation:
Style/CommentedKeyword:
Enabled: false

Style/ComparableClamp:
Enabled: false

Style/ConcatArrayLiterals:
Enabled: false

Style/ConditionalAssignment:
Enabled: false

Expand All @@ -1530,6 +1561,9 @@ Style/ConstantVisibility:
Style/Copyright:
Enabled: false

Style/DataInheritance:
Enabled: false

Style/DateTime:
Enabled: false

Expand All @@ -1539,6 +1573,9 @@ Style/DefWithParentheses:
Style/Dir:
Enabled: false

Style/DirEmpty:
Enabled: false

Style/DisableCopsWithinSourceCodeDirective:
Enabled: false

Expand Down Expand Up @@ -1618,6 +1655,9 @@ Style/ExponentialNotation:
Style/FetchEnvVar:
Enabled: false

Style/FileEmpty:
Enabled: false

Style/FileRead:
Enabled: false

Expand Down Expand Up @@ -1708,6 +1748,9 @@ Style/InlineComment:
Style/InverseMethods:
Enabled: false

Style/InvertibleUnlessCondition:
Enabled: false

Style/IpAddresses:
Enabled: false

Expand All @@ -1733,6 +1776,9 @@ Style/MapCompactWithConditionalBlock:
Style/MapToHash:
Enabled: false

Style/MapToSet:
Enabled: false

Style/MethodCallWithArgsParentheses:
Enabled: false

Expand All @@ -1748,6 +1794,9 @@ Style/MethodDefParentheses:
Style/MinMax:
Enabled: false

Style/MinMaxComparison:
Enabled: false

Style/MissingElse:
Enabled: false

Expand Down Expand Up @@ -1842,7 +1891,7 @@ Style/NumericLiteralPrefix:
Enabled: true

Style/NumericLiterals:
Enabled: true
Enabled: false

Style/NumericPredicate:
Enabled: false
Expand Down Expand Up @@ -1919,6 +1968,15 @@ Style/RedundantCondition:
Style/RedundantConditional:
Enabled: false

Style/RedundantConstantBase:
Enabled: false

Style/RedundantDoubleSplatHashBraces:
Enabled: false

Style/RedundantEach:
Enabled: false

Style/RedundantException:
Enabled: true

Expand All @@ -1931,12 +1989,18 @@ Style/RedundantFileExtensionInRequire:
Style/RedundantFreeze:
Enabled: true

Style/RedundantHeredocDelimiterQuotes:
Enabled: false

Style/RedundantInitialize:
Enabled: false

Style/RedundantInterpolation:
Enabled: true

Style/RedundantLineContinuation:
Enabled: false

Style/RedundantParentheses:
Enabled: true

Expand Down Expand Up @@ -1973,6 +2037,9 @@ Style/RedundantStringEscape:
Style/RegexpLiteral:
Enabled: false

Style/RequireOrder:
Enabled: false

Style/RescueModifier:
Enabled: true

Expand Down Expand Up @@ -2142,5 +2209,8 @@ Style/WordArray:
Style/YodaCondition:
Enabled: false

Style/YodaExpression:
Enabled: false

Style/ZeroLengthPredicate:
Enabled: true
2 changes: 1 addition & 1 deletion .ruby-version.example
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.4
3.0.4

0 comments on commit b6b69d4

Please sign in to comment.