Skip to content

Commit

Permalink
Merge branch 'master' into prevent-generate-invoices-when-distributor…
Browse files Browse the repository at this point in the history
…-cannot-invoice
  • Loading branch information
abdellani authored Apr 22, 2024
2 parents ee1f608 + 4a3f413 commit 7aad4ad
Show file tree
Hide file tree
Showing 840 changed files with 20,808 additions and 12,012 deletions.
1 change: 1 addition & 0 deletions .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ SITE_URL="test.host"

OPENID_APP_ID="test-provider"
OPENID_APP_SECRET="12345"
OPENID_REFRESH_TOKEN="dummy-refresh-token"
8 changes: 7 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
# Dependabot configuration
#
# The `directory` and `schedule.interval` options are mandatory.
# Most of the configuration here is not used for security updates though.

version: 2
updates:

- package-ecosystem: "bundler"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 10

# Only specific requirements are specified in Gemfile, so don't touch it.
versioning-strategy: lockfile-only

- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"

# All versions are specified in package.json, so please update them.
versioning-strategy: increase
7 changes: 5 additions & 2 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ jobs:
name: runner / rubocop
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v1
- uses: actions/checkout@v3

- uses: ruby/setup-ruby@v1
with:
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

- run: git show --no-patch # the commit being tested (which is often a merge due to actions/checkout@v3)

Expand All @@ -21,6 +22,8 @@ jobs:
rubocop_extensions: rubocop-rails:gemfile rubocop-rspec:gemfile
reporter: github-pr-check
level: error
filter_mode: nofilter
use_bundler: true
fail_on_error: true
prettier:
name: runner / prettier
Expand Down
13 changes: 8 additions & 5 deletions .rubocop_rspec_styleguide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@ RSpec:
FactoryBot:
Enabled: false

# Enabled rules

Capybara/NegationMatcher:
Enabled: true
EnforcedStyle: not_to

RSpec/ExpectChange:
Enabled: true
EnforcedStyle: block

RSpec/MultipleExpectations:
Max: 5 # Default 1

RSpec/MultipleMemoizedHelpers:
Max: 10 # Default 5
RSpec/NotToNot:
Enabled: true
4 changes: 3 additions & 1 deletion .rubocop_styleguide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# These are the rules we agreed upon and we work towards.
AllCops:
NewCops: enable
SuggestExtensions: false
Exclude:
- bin/**/*
- db/**/*
Expand Down Expand Up @@ -125,6 +124,9 @@ Rails/SkipsModelValidations:
- update_column
- update_columns

Rails/WhereExists:
EnforcedStyle: where # Cf. conversion https://github.com/openfoodfoundation/openfoodnetwork/pull/12363

Style/Documentation:
Enabled: false

Expand Down
Loading

0 comments on commit 7aad4ad

Please sign in to comment.