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
28,175 Commits 18 Branches 453 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

28175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
bc50a01953 Ensure deterministic query to avoid deadlocks 2021-12-14 11:33:16 +11:00
Maikel Linke
9b6c9bd773 Synchronise processing of proxy orders 2021-12-14 11:33:16 +11:00
Maikel Linke
ce0913758b Bring initial proxy order processing closer 
We want to make it one transaction soon.
 2021-12-14 11:33:16 +11:00
Maikel Linke
7fdc2fdea2 Spec duplicate subscription order issue #8606 2021-12-14 11:33:16 +11:00
Matt-Yorkley
3800eb0eef Merge pull request #8610 from Matt-Yorkley/user-class 
Remove Spree.user_class
 2021-12-13 15:52:00 +00:00
Maikel Linke
b7e0d46dad Style Layout/LineLength 2021-12-13 13:56:52 +11:00
Maikel Linke
6aa6506df0 Style/StringConcatenation 2021-12-13 13:52:57 +11:00
Matt-Yorkley
48048e11e7 Improve test coverage around packing report filtering 2021-12-12 13:23:56 +00:00
Matt-Yorkley
aecdfee364 Reorganise :though associations on line_item and allow searching/filtering on product, supplier, order_cycle 2021-12-12 13:23:56 +00:00
Matt-Yorkley
1efaa7e726 Switch search filters from orders to line_items 2021-12-12 13:23:56 +00:00
Matt-Yorkley
e3f9825696 Rename #scoped_orders_relation 2021-12-11 19:04:22 +00:00
filipefurtad0
af548815ae Fixes rubocop warnings 2021-12-11 17:48:09 +00:00
filipefurtad0
67d24373e6 Updates assertion to be Ferrum syntax compliant 2021-12-11 17:40:56 +00:00
filipefurtad0
eb315b42e4 Updates cookie_helper to support Ferrum syntax 2021-12-11 17:39:39 +00:00
filipefurtad0
472cc114c0 Fixes line break assertion in account_spec 2021-12-11 17:03:00 +00:00
Filipe
f7087842b4 Merge pull request #8556 from sinansonmez/8546-include-navigation-only-for-super-admins 
Navigation is included only for super admin users
v4.1.11 		2021-12-11 16:34:10 +00:00
Matt-Yorkley
1143960ce1 Merge pull request #8607 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.4 
Bump jest from 27.4.3 to 27.4.4
 2021-12-11 13:04:22 +00:00
Sebastian Castro
e20a8122b1 Make the shop filter section always visible when scrolling 2021-12-10 20:53:47 +01:00
Sebastian Castro
8fe125bd1b Adds thin-scroll-bar class 2021-12-10 20:53:47 +01:00
Matt-Yorkley
6d2521bf5f Remove Spree.user_class 
This construct was previously used in Spree to switch out the user class with a dummy class during certain tests. We don't use this any more, so it's just mess.

🔥
 2021-12-10 18:18:20 +00:00
filipefurtad0
345b9a181c Updates/moves shops_spec into system 2021-12-10 17:48:01 +00:00
filipefurtad0
0e8cc0f916 Updates/moves producers_spec into system 2021-12-10 17:48:01 +00:00
filipefurtad0
2e313dd5e5 Updates/moves multilingual_spec into system 2021-12-10 17:48:01 +00:00
filipefurtad0
2b02fd8826 Updates/moves groups_spec into system 2021-12-10 17:48:01 +00:00
filipefurtad0
83468710d3 Updates/moves footer_links_spec into system 2021-12-10 17:48:01 +00:00
filipefurtad0
f304c6ad9c Updates/moves account_spec into system 2021-12-10 17:48:01 +00:00
Filipe
215d8fc86e Merge pull request #8605 from mkllnk/8449-flaky-spec 
Make flaky system spec reliable
 2021-12-10 16:49:39 +00:00
dependabot[bot]
9797116bba Bump jest from 27.4.3 to 27.4.4 
Bumps [jest](https://github.com/facebook/jest) from 27.4.3 to 27.4.4.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.4.3...v27.4.4)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-10 16:28:29 +00:00
Matt-Yorkley
d424476854 Merge pull request #8609 from Matt-Yorkley/babel-loader 
Add babel-loader to JS dependencies
 2021-12-10 16:22:07 +00:00
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
Matt-Yorkley
a4794b22d5 Delete route to non-existent paypal controller action 2021-12-10 11:46:53 +00:00
Matt-Yorkley
9fa19cb772 Update namespacing in specs 2021-12-10 11:46:53 +00:00
Matt-Yorkley
f101b06226 Update all references to paypal routes 2021-12-10 11:46:53 +00:00
Matt-Yorkley
0b48fa540a Move paypal routes out of spree namespace 2021-12-10 11:46:52 +00:00
Matt-Yorkley
575f409ebf Delete routes to non-existant content controller 2021-12-10 11:46:52 +00:00
Matt-Yorkley
5a1aa300d5 Delete route to non-existant checkout controller action 2021-12-10 11:46:52 +00:00
Matt-Yorkley
0d620aac94 Move paypal_controller out of spree namespace 2021-12-10 11:46:52 +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 Linke
0a8ad8bd37 Make flaky system spec reliable 
It was failing 50% of the time since it was converted into a system
spec.
 2021-12-10 14:03:22 +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