raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,241 Commits 18 Branches 452 Tags
d65b1bb38681644f8f6a4f1ef83c1906b66f24dc
Commit Graph

26241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Bellet
d65b1bb386 Fix various import issue: mock bugsnag 2023-02-09 16:50:40 +01:00
Jean-Baptiste Bellet
2633ee3606 Fix various import issue: taxons 2023-02-09 16:50:40 +01:00
Jean-Baptiste Bellet
4027eacc06 Fix various import issue: module('admin.enterprises') 2023-02-09 16:50:40 +01:00
Jean-Baptiste Bellet
236e77efd4 Fix various import: CurrentUser 2023-02-09 16:50:40 +01:00
Jean-Baptiste Bellet
a486a08bfc Fix various import issues: currentHub 2023-02-09 16:50:40 +01:00
dependabot[bot]
292338d467 Bump jasmine-core from 2.4.1 to 4.5.0 
Bumps [jasmine-core](https://github.com/jasmine/jasmine) from 2.4.1 to 4.5.0.
- [Release notes](https://github.com/jasmine/jasmine/releases)
- [Changelog](https://github.com/jasmine/jasmine/blob/main/RELEASE.md)
- [Commits](https://github.com/jasmine/jasmine/compare/v2.4.1...v4.5.0)

---
updated-dependencies:
- dependency-name: jasmine-core
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-09 16:50:40 +01:00
jibees
a3278ab6d3 Merge pull request #10404 from openfoodfoundation/dependabot/bundler/rubocop-1.45.1 
Bump rubocop from 1.44.1 to 1.45.1
 2023-02-09 10:15:34 +01:00
dependabot[bot]
416a2efea9 Bump rubocop from 1.44.1 to 1.45.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.44.1 to 1.45.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.44.1...v1.45.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-09 09:03:13 +00:00
David Cook
4cf45dcfe1 Update translations v4.2.34 2023-02-09 13:54:29 +11:00
David Cook
0f06c86008 Merge pull request #10367 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.10.1 
Bump mrujs from 0.7.4 to 0.10.1
 2023-02-09 12:11:18 +11:00
Rachel Arnould
f8cceef932 Merge pull request #10312 from openfoodfoundation/dependabot/bundler/gitlab-omniauth-openid-connect-0.10.1 
Bump gitlab-omniauth-openid-connect from 0.10.0 to 0.10.1
 2023-02-08 16:05:05 +01:00
Filipe
d5b0891a74 Merge pull request #10382 from jibees/clean-database-for-report_inverse_columns_logic-feature-toggle 
Remove `report_inverse_columns_logic` from list of feature toggle
 2023-02-08 12:39:25 +00:00
Filipe
81b4433b02 Merge pull request #10393 from mkllnk/ransack 
Bump ransack from 2.4.2 to 2.6.0
 2023-02-08 12:12:13 +00:00
jibees
b73d78c785 Merge pull request #10399 from openfoodfoundation/dependabot/bundler/bugsnag-6.25.2 
Bump bugsnag from 6.25.1 to 6.25.2
 2023-02-08 10:26:31 +01:00
jibees
b7b80509dc Merge pull request #10396 from openfoodfoundation/dependabot/npm_and_yarn/prettier-2.8.4 
Bump prettier from 2.8.3 to 2.8.4
 2023-02-08 10:24:48 +01:00
dependabot[bot]
57d36d2ff1 Bump bugsnag from 6.25.1 to 6.25.2 
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.25.1 to 6.25.2.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.25.1...v6.25.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-08 09:05:24 +00:00
dependabot[bot]
c38f1b88d3 Bump prettier from 2.8.3 to 2.8.4 
Bumps [prettier](https://github.com/prettier/prettier) from 2.8.3 to 2.8.4.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.8.3...2.8.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-08 09:02:06 +00:00
jibees
8c6a32100d Merge pull request #10388 from openfoodfoundation/dependabot/npm_and_yarn/prettier-2.8.3 
Bump prettier from 2.7.1 to 2.8.3
 2023-02-08 09:26:36 +01:00
jibees
559b953e16 Merge pull request #10387 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.2.0 
Bump @floating-ui/dom from 1.1.1 to 1.2.0
 2023-02-08 09:25:03 +01:00
Konrad
73d98bd1b4 Merge pull request #10322 from jibees/8027-performance-improvement-on-adminenterprises 
For super admin, add pagination on `/admin/enterprises`
 2023-02-08 09:04:41 +01:00
Maikel
66a29e58d2 Merge pull request #10340 from mkllnk/job-process-waiting 
Wait only for report jobs within Puma workers
 2023-02-08 14:26:43 +11:00
Maikel Linke
97b5a7f99c Bump ransack from 2.4.2 to 2.6.0 
Preparing for Rails 7.
 2023-02-08 11:16:25 +11:00
Maikel
0ca7319e32 Merge pull request #10391 from jibees/10390-current-master-not-in-prod-missing-pagination-from-orders-page 
Orders page and BOM page: use the same pagination file
 2023-02-08 11:15:31 +11:00
Jean-Baptiste Bellet
80ba228910 Partial is used in two different contexts: orders and line_items 
Distinguish them by adding a local variable model that could either be `orders` or `line_items`
 2023-02-07 18:10:29 +01:00
Filipe
0f203a474c Merge pull request #10375 from jibees/10363-bom-page-is-not-finding-or-displaying-name-email-or-order-number-for-some-orders 
BOM: Ensure orders informations are loaded for each line items
 2023-02-07 16:34:57 +00:00
jibees
10bacea861 Merge pull request #10389 from dacook/use-same-node-version-in-ci 
Use .node-version in CI
 2023-02-07 14:54:13 +01:00
Jean-Baptiste Bellet
237b0f03b5 Remove report_inverse_columns_logic from list of feature toggle 
Co-Authored-By: Maikel <maikel@email.org.au>
 2023-02-07 14:41:53 +01:00
David Cook
af5e44e3f3 Use .node-version in CI 
This ensures that all our automated tests are using the same version.
I'm not sure it matters what version Prettier runs on, but thought it should be the same.

This is a down-grade, but it's better to match the version in production. The next step will be to upgrade again for production.
 2023-02-07 21:25:20 +11:00
dependabot[bot]
68acca2530 Bump prettier from 2.7.1 to 2.8.3 
Bumps [prettier](https://github.com/prettier/prettier) from 2.7.1 to 2.8.3.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.7.1...2.8.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-07 09:02:25 +00:00
dependabot[bot]
180aabdb90 Bump @floating-ui/dom from 1.1.1 to 1.2.0 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.2.0/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-07 09:02:00 +00:00
Maikel
c82af88c48 Merge pull request #10371 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.4.1 
Bump karma from 6.3.20 to 6.4.1
 2023-02-07 16:43:19 +11:00
Maikel
40eae3f84d Merge pull request #10378 from openfoodfoundation/dependabot/bundler/valid_email2-4.0.5 
Bump valid_email2 from 4.0.4 to 4.0.5
 2023-02-07 16:41:47 +11:00
dependabot[bot]
64e6bd8248 Bump mrujs from 0.7.4 to 0.10.1 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.7.4 to 0.10.1.
- [Release notes](https://github.com/ParamagicDev/mrujs/releases)
- [Changelog](https://github.com/KonnorRogers/mrujs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ParamagicDev/mrujs/compare/v0.7.4...v0.10.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-06 10:45:12 +00:00
jibees
e066e5ca74 Merge pull request #10370 from openfoodfoundation/dependabot/npm_and_yarn/jquery-ui-1.13.2 
Bump jquery-ui from 1.13.0 to 1.13.2
 2023-02-06 11:43:47 +01:00
jibees
9317cc41b9 Merge pull request #10379 from openfoodfoundation/dependabot/bundler/responders-3.1.0 
Bump responders from 3.0.1 to 3.1.0
 2023-02-06 11:34:19 +01:00
dependabot[bot]
1a35882fb6 Bump responders from 3.0.1 to 3.1.0 
Bumps [responders](https://github.com/heartcombo/responders) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/heartcombo/responders/releases)
- [Changelog](https://github.com/heartcombo/responders/blob/main/CHANGELOG.md)
- [Commits](https://github.com/heartcombo/responders/compare/v3.0.1...v3.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-06 09:08:09 +00:00
dependabot[bot]
ec3d7174de Bump valid_email2 from 4.0.4 to 4.0.5 
Bumps [valid_email2](https://github.com/micke/valid_email2) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/micke/valid_email2/releases)
- [Changelog](https://github.com/micke/valid_email2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micke/valid_email2/compare/v4.0.4...v4.0.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-06 09:01:57 +00:00
Maikel
207a3c9ea7 Merge pull request #10357 from openfoodfoundation/dependabot/bundler/webpacker-5.4.4 
Bump webpacker from 5.4.3 to 5.4.4
 2023-02-06 16:26:40 +11:00
Maikel
9ff8433a8d Merge pull request #10344 from filipefurtad0/update_orders_spec_II 
Update orders spec ii
 2023-02-06 14:32:14 +11:00
jibees
6549ad7d2a Merge pull request #10366 from dacook/node-version 
Update Node version
 2023-02-03 15:12:08 +01:00
jibees
7d1b71e640 Merge pull request #10300 from dacook/add-webpack-cli 
Add required webpack package
 2023-02-03 14:22:50 +01:00
Jean-Baptiste Bellet
bddd887dcd Load orders only if current line_items are loaded 
+ update spec as well
 2023-02-03 12:25:47 +01:00
Jean-Baptiste Bellet
d00e75de70 We should load orders that are linked to line_items displayed 
This should not be related to any pagination, search or whatever: actually we consolidate line_items with order additional info based on line_items.order.id.
 2023-02-03 11:40:07 +01:00
Jean-Baptiste Bellet
06cbc120f5 Pagination is actually linked to line_items and not orders 
We display line_items as rows in BOM
 2023-02-03 11:37:51 +01:00
dependabot[bot]
e91c4f1318 Bump karma from 6.3.20 to 6.4.1 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.20 to 6.4.1.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.20...v6.4.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-03 08:51:33 +00:00
jibees
428b8b0314 Merge pull request #10365 from dacook/webpack-config 
Make webpack-cli a dev-only dependency
 2023-02-03 09:49:43 +01:00
dependabot[bot]
7d5ddb9cf6 Bump jquery-ui from 1.13.0 to 1.13.2 
Bumps [jquery-ui](https://github.com/jquery/jquery-ui) from 1.13.0 to 1.13.2.
- [Release notes](https://github.com/jquery/jquery-ui/releases)
- [Commits](https://github.com/jquery/jquery-ui/compare/1.13.0...1.13.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-03 08:48:37 +00:00
jibees
cc5632fd14 Merge pull request #10364 from dacook/dependabot-update-js-packages 
Allow Dependabot to update package.json
 2023-02-03 09:46:05 +01:00
Jean-Baptiste Bellet
9b2ed8846c load_enterprise_set_on_index is used only in one action 
so let's call it inside the action.
 2023-02-03 09:15:07 +01:00
Jean-Baptiste Bellet
e18454c55a Add pagination on enterprises page for super admin 
Enterprises are stored in `@enterprise_set` variables, and we iterate over to show the list of enterprises to super admin.

Previously, we used to use `Sets::EnterpriseSet.new(collection)` instead of creating set based on `@collection`: this leads to call the `collection` method twice, which was probably very time consuming. This commit fix also that.

+ use paginated enterprises loading on bulk update but without testing if the current user is an admin
 2023-02-03 09:15:07 +01:00