raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-07 22:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,044 Commits 18 Branches 453 Tags
38f97ffc8ef6863c9892b207eef6e19d06f6687a
Commit Graph

31044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
38f97ffc8e chore(deps): bump devise from 4.9.3 to 4.9.4 
Bumps [devise](https://github.com/heartcombo/devise) from 4.9.3 to 4.9.4.
- [Release notes](https://github.com/heartcombo/devise/releases)
- [Changelog](https://github.com/heartcombo/devise/blob/main/CHANGELOG.md)
- [Commits](https://github.com/heartcombo/devise/compare/v4.9.3...v4.9.4)

---
updated-dependencies:
- dependency-name: devise
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-11 10:23:21 +00:00
Maikel
dc7c5b6748 Merge pull request #12359 from openfoodfoundation/dependabot/bundler/stripe-10.15.0 
chore(deps): bump stripe from 10.14.0 to 10.15.0
 2024-04-11 16:25:04 +10:00
Maikel
082b1f9411 Merge pull request #12300 from mkllnk/checkout-steps 
Remove unnecessary method checkout_steps
 2024-04-11 15:57:45 +10:00
David Cook
5554eee0d1 Merge pull request #12354 from openfoodfoundation/dependabot/npm_and_yarn/tar-6.2.1 
chore(deps): bump tar from 6.1.11 to 6.2.1
 2024-04-11 11:49:33 +10:00
Maikel Linke
2f3b8c8573 Re-record Stripe cassettes 2024-04-11 11:45:14 +10:00
David Cook
3318c2622d Merge pull request #12352 from cyrillefr/FixRailsWhereEquals 
Fix rubocop FixRailsWhereEquals
 2024-04-11 11:43:03 +10:00
Maikel
f6dbb78686 Merge pull request #12360 from openfoodfoundation/dependabot/bundler/spring-4.2.0 
chore(deps-dev): bump spring from 4.1.3 to 4.2.0
 2024-04-11 11:40:19 +10:00
David Cook
a94901fc99 Merge pull request #12358 from openfoodfoundation/dependabot/bundler/valid_email2-5.2.3 
chore(deps): bump valid_email2 from 5.2.1 to 5.2.3
 2024-04-11 11:28:08 +10:00
dependabot[bot]
0be720dcb1 chore(deps): bump tar from 6.1.11 to 6.2.1 
Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.11 to 6.2.1.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v6.1.11...v6.2.1)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-11 01:27:41 +00:00
Maikel
1459c9ee94 Merge pull request #12345 from chahmedejaz/task/12332-fix-rubocop-locale-errors 
Fix Rubocop Locale Errors
 2024-04-11 11:24:30 +10:00
Maikel Linke
c2c7910357 Reset I18n.local for each spec 
This avoids a locale setting leaking from one spec to another. It also
means that we don't have to reset the locale in individual specs.

Also:

- `cookies` is reset automatically and we don't need to do that.
- Removed some unused code (German number format and helper methods).
 2024-04-11 10:14:52 +10:00
Ahmed Ejaz
b2172ef8d8 12332 - Add around block to apply default_locale on specs 2024-04-11 10:14:52 +10:00
Ahmed Ejaz
ec61cff387 12332 - Fix rubocop Rails/I18nLocaleTexts errors 
- Add en locales for the hardcodded strings
 2024-04-11 10:14:50 +10:00
Ahmed Ejaz
693b9bd171 12332 - Fix rubocop Rails/I18nLocaleAssignment errors 
- use I18n.with_locale method rather than direct locale assignment
 2024-04-11 10:13:50 +10:00
Filipe
89033579bd Merge pull request #12328 from dacook/buu/remove-stimulus-reflex 
[BUU] Remove Stimulus Reflex from Products screen
 2024-04-10 21:59:59 +01:00
Konrad
b3dd51d6ac Merge pull request #12324 from chahmedejaz/task/12314-fix-rubocop-rails-helper-instance-variable 
Fix Rubocop Rails/HelperInstanceVariable
 2024-04-10 20:17:06 +02:00
David Cook
1425d524b9 Fix product filtering 
Merges change from fb09a7f1e6
 2024-04-10 15:17:56 +01:00
David Cook
e78ef120f4 TODO 
I think this case got lost.
 2024-04-10 15:17:56 +01:00
David Cook
129ceb01f0 Fix spec 2024-04-10 15:17:56 +01:00
David Cook
97d13597b0 Fix intermittent bug 
Dunno why, but this recently started occuring for me in dev and test. Browser update?
 2024-04-10 15:17:56 +01:00
David Cook
15790d3d8e Only register event listeners when needed 
Otherwise there could be over 200 listeners on a page.
 2024-04-10 15:17:56 +01:00
David Cook
54d0dfb141 Prevent duplicate products in search results 
Dunno why, but the product was appearing once for each variant.
 2024-04-10 15:17:56 +01:00
David Cook
c4b7b76e64 Avoid pagination when editing errored products 2024-04-10 15:17:56 +01:00
David Cook
fd8be37a62 Use shared page controls on products screen 
This has an auto submit and can potentially work with Turbo, like on the Orders screen.
 2024-04-10 15:17:56 +01:00
David Cook
0fc3d39106 Ensure pagination is retained when saving or discarding 
But we have more work to do.
 2024-04-10 15:17:56 +01:00
David Cook
2c71f7f1ed Discard changes by reloading the page 
Now there's a popup asking to confirm, which I think is worth keeping!
 2024-04-10 15:17:56 +01:00
David Cook
8696e05e66 Move index and bulk_update actions to good ol' HTTP requests 
We've found that we just can't rely in StimulusReflex (and the underlying WebSockets stack) to guarantee a response to a request.
Because of this, there was intermittent issues when the server was overloaded with large requests, and the response never arrived, leaving an infinite loader, and a poor user wondering if anything was still happening.
 2024-04-10 15:17:56 +01:00
David Cook
dadabcf8ad Prettify 2024-04-10 15:17:56 +01:00
David Cook
d904c2a494 Don't warn when submitting form 2024-04-10 15:17:56 +01:00
Konrad
e88335a923 Merge pull request #12303 from arunguleria/12295-translation-fixes-on-return-authorizaton 
12295-Translation fixes for return authorization status
 2024-04-10 14:10:08 +02:00
dependabot[bot]
6bcbbeadc4 chore(deps-dev): bump spring from 4.1.3 to 4.2.0 
Bumps [spring](https://github.com/rails/spring) from 4.1.3 to 4.2.0.
- [Release notes](https://github.com/rails/spring/releases)
- [Changelog](https://github.com/rails/spring/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rails/spring/compare/v4.1.3...v4.2.0)

---
updated-dependencies:
- dependency-name: spring
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-10 10:08:27 +00:00
dependabot[bot]
9897c33a08 chore(deps): bump stripe from 10.14.0 to 10.15.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 10.14.0 to 10.15.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v10.14.0...v10.15.0)

---
updated-dependencies:
- dependency-name: stripe
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-10 09:59:34 +00:00
dependabot[bot]
e5e8d62c6a chore(deps): bump valid_email2 from 5.2.1 to 5.2.3 
Bumps [valid_email2](https://github.com/micke/valid_email2) from 5.2.1 to 5.2.3.
- [Changelog](https://github.com/micke/valid_email2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micke/valid_email2/compare/v5.2.1...v5.2.3)

---
updated-dependencies:
- dependency-name: valid_email2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-10 09:57:15 +00:00
David Cook
ade4e855dc Merge pull request #12341 from mkllnk/connected-app-url 
Make URL to connect app translatable
 2024-04-10 10:36:49 +10:00
David Cook
d4da684f4a Merge pull request #12349 from openfoodfoundation/dependabot/bundler/rubocop-1.63.0 
chore(deps-dev): bump rubocop from 1.62.1 to 1.63.0
 2024-04-10 10:32:32 +10:00
cyrillefr
404fcf1f72 Fix FixRailsWhereEquals 
- fixes offenses caused by RuboCop::Cop::Rails::WhereEquals cop
 2024-04-09 10:44:02 +02:00
Maikel
a40b9eb44e Merge pull request #12316 from anansilva/6055-fix-rubocop-lint-constant-definition-in-block 
Fix rubocop Lint/ConstantDefinitionInBlock group
 2024-04-09 12:52:06 +10:00
Maikel Linke
c0010319af Avoid duplicate loading of task in spec 
The new product image import spec was loading rake tasks multiple times.
That make the spec for enterprise deletion fail when executed afterwards
because the deletion task was executed twice and failed the second time.
 2024-04-09 12:04:42 +10:00
Maikel
c9c94fcaa5 Merge pull request #12337 from cyrillefr/FixRailsNegateIncludeRubocopIssue 
Fix Rubocop Rails/NegateInclude issues
 2024-04-09 10:40:47 +10:00
Gaetan Craig-Riou
103c6e7fc0 Remove debugging line 2024-04-09 10:30:46 +10:00
Gaetan Craig-Riou
1509066b85 Apply new cop Style/MapIntoArray fix 2024-04-09 10:29:30 +10:00
Maikel
169df3fb8b Merge pull request #12343 from filipefurtad0/spec_regression_s2_12340 
Adds regression spec for S2 bug #12340
 2024-04-09 10:16:09 +10:00
Ana Nunes da Silva
061ff91786 Fix offense constant definition in block in validators/integer_array_validator_spec.rb 2024-04-08 11:16:38 +01:00
Ana Nunes da Silva
0aea14832a Fix offense constant definition in block in validators/date_time_string_validator_spec.rb 2024-04-08 11:16:38 +01:00
Ana Nunes da Silva
939605cb7a Fix offense constant definition in block in models/spree/preferences/preferable_spec.rb 2024-04-08 11:16:38 +01:00
Ana Nunes da Silva
b18fe8ce35 Fix offense constant definition in block in models/spree/preferences/configuration_spec.rb 2024-04-08 11:16:38 +01:00
Ana Nunes da Silva
fc3d7f8496 Fix offense constant definition in block in models/spree/gateway_spec.rb 2024-04-08 11:16:38 +01:00
Ana Nunes da Silva
3bd6c85f3b Fix offense constant definition in block in models/spree/ability_spec.rb 2024-04-08 11:16:38 +01:00
Ana Nunes da Silva
0726e4c1d0 Fix offense constant definition in block in reports/line_items_spec.rb 2024-04-08 11:16:38 +01:00
Ana Nunes da Silva
cfca7816d5 Fix offense constant definition in block in serializer_helper_spec.rb 2024-04-08 11:16:38 +01:00