raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,737 Commits 21 Branches 450 Tags
c1d95166403611eee11f7e03ce86dcaef42e8d3e
Commit Graph

22737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
c1d9516640 Add babel-loader to JS dependencies 
This package should have been included by other dependencies, but it seems there's some weird issues with the package not being found and this is one of the main suggested solutions.

Deployments are currently failing with: "ERROR in Entry module not found: Error: Cannot resolve module 'babel-loader'"
 2021-12-10 14:39:40 +00:00
Matt-Yorkley
99aaae1111 Merge pull request #8602 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.9 
Bump @storybook/addon-docs from 6.4.8 to 6.4.9
 2021-12-10 13:23:29 +00:00
dependabot[bot]
cf0738b1d0 Bump @storybook/addon-docs from 6.4.8 to 6.4.9 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.4.8 to 6.4.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.9/addons/docs)

---
updated-dependencies:
- dependency-name: "@storybook/addon-docs"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-10 13:19:22 +00:00
Matt-Yorkley
bb78391759 Merge pull request #8603 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.4.9 
Bump @storybook/server from 6.4.8 to 6.4.9
 2021-12-10 13:15:18 +00:00
dependabot[bot]
5415b30fdf Bump @storybook/server from 6.4.8 to 6.4.9 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.4.8 to 6.4.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.9/app/server)

---
updated-dependencies:
- dependency-name: "@storybook/server"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-10 03:36:16 +00:00
Maikel
ba1e810a3c Merge pull request #8601 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.4.9 
Bump @storybook/addon-controls from 6.4.1 to 6.4.9
 2021-12-10 14:32:17 +11:00
Maikel
4be0536b18 Merge pull request #8597 from openfoodfoundation/transifex 
Transifex
 2021-12-10 12:06:27 +11:00
Maikel
d215294c40 Merge pull request #8567 from LiamMcM/fix-broken-links 
Fix out-of-date links in CONTRIBUTING.md
 2021-12-10 12:05:40 +11:00
Maikel
74de65b183 Merge pull request #8570 from mkllnk/rubocop 
Update Rubocop config
 2021-12-10 09:45:45 +11:00
Maikel Linke
67aa3447da Automatically regenerate style todo list 
We used to keep a manual file for metrics violations because the
automatic file didn't exclude on a file-by-file basis. But Rubocop has
an additional option these days so that we can generate that
automatically in the normal todo list.

The todo list was also out of date.
 2021-12-10 09:29:20 +11:00
Maikel Linke
faf0a3ab84 Remove unnecessary disabling of cop 2021-12-10 09:26:57 +11:00
Maikel Linke
207cc8908a Remove useless assignments 
Rubocop highlighted this. The todo list actually contains these files
but somehow the cop still runs and reports these as violations.
 2021-12-10 09:26:57 +11:00
Maikel Linke
64d25b2999 Remove dead code highlighted by Rubocop 
The assignments here didn't actually do anything and `number` was
restricted to numbers only already. No whitespace to remove.
 2021-12-10 09:26:57 +11:00
dependabot[bot]
baaf24948a Bump @storybook/addon-controls from 6.4.1 to 6.4.9 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.4.1 to 6.4.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.9/addons/controls)

---
updated-dependencies:
- dependency-name: "@storybook/addon-controls"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-09 09:06:11 +00:00
Transifex-Openfoodnetwork
a2b734f636 Updating translations for config/locales/en_US.yml 2021-12-09 01:41:49 +11:00
Maikel
8107aa3a05 Merge pull request #8589 from filipefurtad0/shop_products_spec_into_system 
Remaining shopping specs into system
 2021-12-08 18:17:51 +11:00
Maikel
d38d8283b1 Merge pull request #8588 from filipefurtad0/shop_embedded_into_system 
Updates/moves embedded_groups into system
 2021-12-08 18:13:30 +11:00
Maikel
77085cf9bb Merge pull request #8587 from filipefurtad0/checkout_stripe_into_system 
Updates/moves checkout_stripe into system
 2021-12-08 18:12:49 +11:00
Maikel
9307b97f5b Merge pull request #8586 from filipefurtad0/checkout_paypal_into_system 
Updates/moves checkout_paypal into system
 2021-12-08 18:11:45 +11:00
Maikel
81fff677ac Merge pull request #8584 from filipefurtad0/shop_cart_spec_into_system 
Updates/moves cart_spec into system
 2021-12-08 18:10:34 +11:00
Maikel
2dd80a8c6b Merge pull request #8583 from filipefurtad0/shopping_caching_into_system 
Updates/moves shops_caching into system
 2021-12-08 18:09:23 +11:00
Maikel
1957ae185b Merge pull request #8582 from filipefurtad0/darkswarm_into_system 
Updates/moves darkswarm_caching into system
 2021-12-08 18:07:49 +11:00
Maikel
086b469a1a Merge pull request #8575 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.4.8 
Bump @storybook/server from 6.3.12 to 6.4.8
 2021-12-08 18:06:57 +11:00
Maikel
65e5291679 Merge pull request #8569 from Matt-Yorkley/dead-code-backordered 
Remove dead code: Order#backordered?
 2021-12-08 18:05:38 +11:00
Maikel
d34478f271 Merge pull request #8448 from filipefurtad0/reports_spec_into_system 
Moves/updates reports_spec.rb into system
 2021-12-08 18:03:48 +11:00
dependabot[bot]
4bbdaf07ea Bump @storybook/server from 6.3.12 to 6.4.8 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.3.12 to 6.4.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.8/app/server)

---
updated-dependencies:
- dependency-name: "@storybook/server"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-08 05:10:04 +00:00
Maikel
d2c0c3ff7b Merge pull request #8573 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.8 
Bump @storybook/addon-docs from 6.4.3 to 6.4.8
 2021-12-08 16:07:43 +11:00
filipefurtad0
9565400ee0 Removes typo, deletes byebug 2021-12-07 17:30:58 +00:00
filipefurtad0
7f39a1e1d6 Removes line break in assertion 2021-12-07 17:26:06 +00:00
filipefurtad0
5a77ee75e1 Moves/Updates variant_override_spec into system 2021-12-07 16:35:19 +00:00
filipefurtad0
28698ab3bd Moves/Updates unit_price_spec into system 2021-12-07 16:25:21 +00:00
filipefurtad0
85a41205e9 Moves/Updates products_spec into system 2021-12-07 16:23:52 +00:00
filipefurtad0
9488ba097e Updates/moves embedded_groups into system 2021-12-07 16:10:25 +00:00
filipefurtad0
7dd002cb4d Updates/moves checkout_stripe into system 2021-12-07 16:01:56 +00:00
filipefurtad0
4fbc7eeb44 Updates/moves checkout_paypal into system 2021-12-07 13:46:40 +00:00
Matt-Yorkley
53d01b1275 Update all locales with the latest Transifex translations v4.1.10 2021-12-07 13:30:07 +00:00
Matt-Yorkley
775475f88a Merge pull request #8566 from openfoodfoundation/transifex 
Transifex
 2021-12-07 13:26:25 +00:00
Matt-Yorkley
0197831246 Merge pull request #8585 from openfoodfoundation/revert-8500-8495-Variant-unit-name-shopfront 
Revert "Fixed inconsistency with display of unit name for products sold by item"
 2021-12-07 13:24:38 +00:00
Matt-Yorkley
290e292dea Revert "Fixed inconsistency with display of unit name for products sold by item" 2021-12-07 13:24:12 +00:00
filipefurtad0
bceecc533e Updates/moves cart_spec into system 2021-12-07 11:21:27 +00:00
filipefurtad0
fb87ef29a6 Updates/moves shops_caching into system 2021-12-07 11:09:17 +00:00
filipefurtad0
37d4a21521 Updates/moves darkswarm_caching into system 2021-12-07 10:45:38 +00:00
Filipe
2233c7ae0f Merge pull request #8571 from mkllnk/fix-flaky-product-import 
Avoid flaky race conditions in product import spec
 2021-12-07 10:32:00 +00:00
Maikel Linke
5793ddfe1b Give product import spec more time 
It seems to be really slow.
 2021-12-07 17:06:45 +11:00
Transifex-Openfoodnetwork
fa2b14e31b Updating translations for config/locales/en_GB.yml 2021-12-06 21:03:46 +11:00
filipefurtad0
1bd04f283f Fixes rubocop update validation errors 2021-12-06 09:14:21 +00:00
dependabot[bot]
201d663d10 Bump @storybook/addon-docs from 6.4.3 to 6.4.8 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.4.3 to 6.4.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.8/addons/docs)

---
updated-dependencies:
- dependency-name: "@storybook/addon-docs"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-06 09:07:29 +00:00
Maikel Linke
d99feeaaa5 Remove unreliable spec expectation 
We were not failing if these percentages were not displayed. But the
spec did fail when the import was finished already and the progress bar
wasn't there any more.

Let's avoid these race conditions and wait for the final completion
page.
 2021-12-06 18:06:16 +11:00
Maikel Linke
dc7dfcacba Wait for product import to finish in spec 
The expectation returned to early.
 2021-12-06 18:01:17 +11:00
Matt-Yorkley
87fe341b5b Remove dead code: Order#backordered? 2021-12-05 15:17:27 +00:00