raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,833 Commits 17 Branches 455 Tags
5f4aed92d81114df87516be076b5162f9511e4e8
Commit Graph

25833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
063e424bc0 Merge pull request #9878 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.117.0 2022-10-26 12:36:25 +00:00
filipefurtad0
b53faceebb Retries improved but still flaky examples 2022-10-26 13:26:21 +01:00
filipefurtad0
aebf84b53f Brings back rspec-retry gem and configs 2022-10-26 13:26:21 +01:00
dependabot[bot]
9ce1c536e4 Merge pull request #9880 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.17.1 2022-10-26 09:50:48 +00:00
Jean-Baptiste Bellet
edb2645af1 Add a country to test db and modify one spec 
Check that businness address changes are ok
Test with another county since only one country and one state couldn't spot the fact that when changing country it needs to change also states selector
 2022-10-26 11:21:44 +02:00
Jean-Baptiste Bellet
d797ef2b3a As we are in the Business Address panel, use the business_address attr 
Not the address one, which is different

Business address country could be null, so use an empty array
 2022-10-26 11:21:44 +02:00
Jean-Baptiste Bellet
d46105ea90 Correct some input styling 2022-10-26 11:21:44 +02:00
Jean-Baptiste Bellet
151e71b4d9 Actually controller is named dependEnt-select 2022-10-26 11:21:44 +02:00
Jean-Baptiste Bellet
b6bc4c66a2 Specify the current value of country 2022-10-26 11:21:44 +02:00
dependabot[bot]
b8b50fa165 Bump rubocop-rails from 2.16.1 to 2.17.1 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.16.1 to 2.17.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.16.1...v2.17.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-26 09:06:16 +00:00
dependabot[bot]
4d23113265 Bump oauth2 from 1.4.10 to 1.4.11 
Bumps [oauth2](https://gitlab.com/oauth-xx/oauth2) from 1.4.10 to 1.4.11.
- [Release notes](https://gitlab.com/oauth-xx/oauth2/tags)
- [Changelog](https://gitlab.com/oauth-xx/oauth2/blob/main/CHANGELOG.md)
- [Commits](https://gitlab.com/oauth-xx/oauth2/compare/v1.4.10...v1.4.11)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-26 09:04:45 +00:00
dependabot[bot]
f909b742ce Bump aws-sdk-s3 from 1.116.0 to 1.117.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.116.0 to 1.117.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-26 09:04:18 +00:00
Maikel Linke
6aefc23c35 Allow devs to lazy-load app with right dependency 2022-10-26 14:08:27 +11:00
Maikel Linke
7c562d321d Activate DfcProvider with feature toggle, not prod 
We want to test in dev and on staging, too.
 2022-10-26 14:08:27 +11:00
Maikel
5a4727138c Merge pull request #9875 from filipefurtad0/fix_flaky_spec_8701 
Minor changes to improve flakyness
 2022-10-26 14:00:08 +11:00
Maikel
fe05d17078 Merge pull request #9872 from jibees/update-actions/upload-artifact-to-lastest-version 
Build: use the latest version of `actions/upload-artifact`
 2022-10-26 13:58:48 +11:00
Maikel Linke
9f9d8020c1 Fix URL generation for report without subtype 
The URL is generated in the partial and it just needs to know that
there's no subtype.
 2022-10-26 11:53:25 +11:00
Maikel Linke
3ebd896c3e Remove outdated ignoring of columns 
Those columns have been removed from the database and don't need to be
ignored any more.
 2022-10-26 10:42:19 +11:00
filipefurtad0
14955ac8ca Minor changes to improve flakyness 2022-10-25 17:39:10 +01:00
dependabot[bot]
06c6853323 Merge pull request #9856 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.5.13 2022-10-25 14:08:01 +00:00
dependabot[bot]
4e0b206c7b Merge pull request #9857 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.5.13 2022-10-25 13:59:39 +00:00
Konrad
3d003a735f Merge pull request #9851 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.116.0 
Bump aws-sdk-s3 from 1.114.0 to 1.116.0
 2022-10-25 15:52:34 +02:00
Jean-Baptiste Bellet
e16c8661a2 Use the same template even if there is no sub_report 2022-10-25 15:27:43 +02:00
dependabot[bot]
eaa6e9bc18 Bump @storybook/addon-docs from 6.5.12 to 6.5.13 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.5.12 to 6.5.13.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.13/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.13/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>
 2022-10-25 13:20:15 +00:00
dependabot[bot]
91652ba792 Bump @storybook/addon-controls from 6.5.12 to 6.5.13 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.5.12 to 6.5.13.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.13/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.13/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>
 2022-10-25 13:19:28 +00:00
dependabot[bot]
4bf640f0c4 Merge pull request #9866 from openfoodfoundation/dependabot/bundler/rubocop-1.37.1 2022-10-25 13:18:51 +00:00
jibees
cf489e809f Merge pull request #9867 from openfoodfoundation/dependabot/bundler/rswag-specs-2.7.0 
Bump rswag-specs from 2.6.0 to 2.7.0
 2022-10-25 15:18:18 +02:00
jibees
35bb539271 Merge pull request #9855 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-7.2.4 
Bump @hotwired/turbo from 7.2.2 to 7.2.4
 2022-10-25 15:17:25 +02:00
jibees
b3020a5573 Merge pull request #9854 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.0.3 
Bump @floating-ui/dom from 1.0.2 to 1.0.3
 2022-10-25 15:17:05 +02:00
jibees
250b9bc3c0 Merge pull request #9853 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.5.13 
Bump @storybook/server from 6.5.12 to 6.5.13
 2022-10-25 15:16:30 +02:00
Jean-Baptiste Bellet
e58add6af0 Use the latest version of actions/upload-artifact 2022-10-25 15:00:14 +02:00
filipefurtad0
3447959a06 Adds click_on_select2 helper 2022-10-25 13:32:29 +01:00
Mohamed ABDELLANI
41440af533 test if product's variant is duplicated properly 2022-10-25 11:28:16 +01:00
Mohamed ABDELLANI
826b1e95ef add a product variant. 2022-10-25 11:27:51 +01:00
Mohamed ABDELLANI
6cabbee1a2 rename new_variant double to new_master_variant 2022-10-25 11:27:14 +01:00
Mohamed ABDELLANI
11bc5c775c rename the variant double to master_variant 2022-10-25 11:26:43 +01:00
Mohamed ABDELLANI
788093c7cf implement variant duplication 2022-10-25 11:23:35 +01:00
Mohamed ABDELLANI
f44228eef7 extract variant duplication logic into a separated function 2022-10-25 11:23:35 +01:00
Konrad
62935f65a2 Merge pull request #9849 from openfoodfoundation/dependabot/bundler/active_storage_validations-1.0.2 
Bump active_storage_validations from 1.0.0 to 1.0.2
 2022-10-25 12:04:50 +02:00
Konrad
e8425c5805 Merge pull request #9792 from vsmay98/6531-remove-user-registrations-controller 
Remove spree user registrations controller file
 2022-10-25 11:52:34 +02:00
dependabot[bot]
31cde7e06e Bump @hotwired/turbo from 7.2.2 to 7.2.4 
Bumps [@hotwired/turbo](https://github.com/hotwired/turbo) from 7.2.2 to 7.2.4.
- [Release notes](https://github.com/hotwired/turbo/releases)
- [Commits](https://github.com/hotwired/turbo/compare/v7.2.2...v7.2.4)

---
updated-dependencies:
- dependency-name: "@hotwired/turbo"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-25 09:31:08 +00:00
dependabot[bot]
f467efc42b Bump @storybook/server from 6.5.12 to 6.5.13 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.5.12 to 6.5.13.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.13/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.13/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>
 2022-10-25 09:30:49 +00:00
dependabot[bot]
faa8888e2a Bump @floating-ui/dom from 1.0.2 to 1.0.3 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.0.3/packages/dom)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-25 09:30:47 +00:00
jibees
84f488917e Merge pull request #9865 from jibees/sort-package.json-file 
Sort package.json to avoid conflicts
 2022-10-25 11:29:41 +02:00
dependabot[bot]
00c57fa06c Bump rswag-specs from 2.6.0 to 2.7.0 
Bumps [rswag-specs](https://github.com/rswag/rswag) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rswag/rswag/compare/2.6.0...2.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-25 09:03:31 +00:00
dependabot[bot]
c4748104a0 Bump rubocop from 1.36.0 to 1.37.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.36.0 to 1.37.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.36.0...v1.37.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-25 09:02:59 +00:00
Jean-Baptiste Bellet
46bbf1b1ec Sort package.json to avoid conflicts 2022-10-25 10:54:11 +02:00
Konrad
d12e99e363 Merge pull request #9808 from abdellani/sort_items_by_product_name_in_ocstd_report 
add sort by product name to order_cycle_supplier_totals_by_distributo…
 2022-10-25 10:34:22 +02:00
Jean-Baptiste Bellet
ede38a417f Respect rubocop Metrics/AbcSize by extracting a method 2022-10-25 10:22:35 +02:00
Jean-Baptiste Bellet
23b5e73c97 Weight is computed with unit_value and product variant_unit_scale 2022-10-25 10:22:35 +02:00