raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,676 Commits 18 Branches 452 Tags
aa9fd682d8f0bf1c8e5cff5ae2fec08504cac2f1
Commit Graph

27676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
aa9fd682d8 Remove is_master and not_master scopes 
(cherry picked from commit 1daab8994d)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
5b73ccb213 Remove unused is_master references in tests 
(cherry picked from commit 0703bb4583)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
dda3cfa58d Remove master variant validation conditionals 
(cherry picked from commit 85059bfb26)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
9da649a296 Improve validation feedback on new variant page and add test coverage 
(cherry picked from commit 8247dce2dc)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
2e53b9a0c6 Fix flaky spec: use milliseconds in cache service and remove sleep 
(cherry picked from commit 618900767f)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
527e305e2f Set unit_value to true when cloning a product 
This value doesn't get persisted, but it's presence is validated. The product's duplicated variants store the actual :unit_value attribute

(cherry picked from commit 1e36043a2e)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
89b59f97ee Reorganise associations, validations, scopes and callbacks for clarity 
(cherry picked from commit 1922598d2d)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
26d3cffba3 Remove master variant from product 
(cherry picked from commit 3ef7d2c9ff)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
86703bb545 Migrate first master variant image to product image 
(cherry picked from commit 21cba0aa13)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
8e99f496ff Migrate product image from master variant to product 
(cherry picked from commit 7dc1091bc2)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
2f2506e698 Migrate master variant :sku to product 
(cherry picked from commit d8649fc9fb)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
7ef9c2f56a Stop storing unit_value and unit_description on master variant 
(cherry picked from commit 6b9b5ea347)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
ee4402f751 Stop using master variant for storing :display_as value 
(cherry picked from commit 8c0b8dad85)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
79a2d1228d Stop using master variant as a potential store for prices 
(cherry picked from commit 1b06c20197)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
da3202460c Update old specs that rely on master variant instead of real variants 
(cherry picked from commit 80a0138b48)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
75ccc5c72f Simplify product images delegation mess 
(cherry picked from commit d4188da7c1)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
aca72e6071 Remove dead code 
(cherry picked from commit 42a5a48816)
 2023-06-23 14:16:44 +10:00
Maikel Linke
2453084a6b Update translations v4.3.13 2023-06-16 14:02:47 +10:00
Maikel
39183547aa Merge pull request #11033 from openfoodfoundation/revert-10455-dependabot/bundler/redis-5.0.6 
Revert "Fix `redis` and `hiredis-client` version requirements "
 2023-06-16 13:42:55 +10:00
Maikel
24000b2ce3 Revert "Fix redis and hiredis-client version requirements " 2023-06-16 13:09:25 +10:00
Maikel
8e86f76278 Merge pull request #11018 from openfoodfoundation/dependabot/bundler/sidekiq-7.1.2 
chore(deps): bump sidekiq from 7.1.1 to 7.1.2
 2023-06-16 12:08:25 +10:00
Maikel
4a91c180a3 Merge pull request #11017 from openfoodfoundation/dependabot/bundler/ddtrace-1.12.1 
chore(deps): bump ddtrace from 1.12.0 to 1.12.1
 2023-06-16 11:14:10 +10:00
Maikel
d192024786 Merge pull request #11019 from filipefurtad0/flaky_cache_spec 
Clears cache around examples
 2023-06-16 11:12:24 +10:00
Maikel
ec7de516aa Merge pull request #11011 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.124.0 
chore(deps): bump aws-sdk-s3 from 1.123.1 to 1.124.0
 2023-06-16 10:59:56 +10:00
David Cook
47745b5e49 Merge pull request #11004 from dacook/show-current-version 
Show current version at bottom of admin dashboard
 2023-06-16 09:26:00 +10:00
Matt-Yorkley
3301c7cabc Update stage.yml 2023-06-16 00:18:36 +01:00
David Cook
35d9837f24 Show current version at bottom of admin dashboard 
With generic link to the releases page. We could provide a link to latest tag with `git describe --tags --abbrev=0`. But I thought it better to keep things simple.
 2023-06-16 09:11:59 +10:00
Matt-Yorkley
436deb9797 Update stage.yml 2023-06-16 00:03:16 +01:00
Matt-Yorkley
57451f2639 Update stage.yml 2023-06-15 23:26:27 +01:00
Matt-Yorkley
d56ad66ab8 Update stage.yml 2023-06-15 20:57:40 +01:00
Matt-Yorkley
fc5a53ebd9 Update stage.yml 2023-06-15 20:53:20 +01:00
Matt-Yorkley
f27472106e Update stage.yml 2023-06-15 20:52:07 +01:00
Matt-Yorkley
5729e33f69 Merge pull request #11031 from Matt-Yorkley/deployment-workflow 
Add workflow for deploying to staging
 2023-06-15 20:40:10 +01:00
Matt-Yorkley
584f6297f5 Allow manual workflow triggers 2023-06-15 20:18:44 +01:00
Matt-Yorkley
12bf17e21e Add workflow for deploying to staging 2023-06-15 19:37:18 +01:00
Matt-Yorkley
7068df5d4b Merge pull request #10804 from Matt-Yorkley/public-images 
Update ActiveStorage image processing
 2023-06-15 15:49:11 +01:00
Konrad
7a10edff82 Merge pull request #10988 from jibees/10980-white-label-trix-bullets-and-numbers-are-displayed-outside-the-text-field 
[White Label] Custom tab content editor: order and unordered list should have a margin-left set
 2023-06-15 16:13:19 +02:00
Konrad
5c0db892e5 Merge pull request #10983 from jibees/10982-admin_style_v3-use-oidc-settings-instead-of-oidc-settings-in-navigation 
[OIDC] Translate 'Enterprises' > 'OIDC Settings' tab title
 2023-06-15 16:07:07 +02:00
filipefurtad0
598f69f42f Clears cache around examples 
for specs testing cache
 2023-06-15 11:28:01 +01:00
dependabot[bot]
ca5de6b0b2 chore(deps): bump sidekiq from 7.1.1 to 7.1.2 
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.1.1 to 7.1.2.
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.1.1...v7.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-15 10:05:58 +00:00
dependabot[bot]
b0c9c6e6e1 chore(deps): bump ddtrace from 1.12.0 to 1.12.1 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 1.12.0 to 1.12.1.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v1.12.0...v1.12.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-15 09:58:24 +00:00
Maikel
701fef84f3 Merge pull request #10850 from mkllnk/require-belongs-to--part1 
Require belongs_to associations - part 1
 2023-06-15 09:20:42 +10:00
Konrad
cf3692e688 Merge pull request #10992 from openfoodfoundation/dependabot/bundler/active_storage_validations-1.0.4 
chore(deps): bump active_storage_validations from 1.0.3 to 1.0.4
 2023-06-14 22:25:16 +02:00
Konrad
863fed56ce Merge pull request #10455 from openfoodfoundation/dependabot/bundler/redis-5.0.6 
Fix `redis` and `hiredis-client` version requirements
 2023-06-14 22:09:13 +02:00
Filipe
e6d42a0c4f Merge pull request #10999 from Matt-Yorkley/bom-issues 
Fix BOM order loading issue
 2023-06-14 19:01:54 +01:00
Matt-Yorkley
64508d3c3d Add unit test for direct image URLs 2023-06-14 12:53:20 +01:00
Matt-Yorkley
395cf7fb8d Use direct image URLs for enterprise logos 2023-06-14 12:53:20 +01:00
Matt-Yorkley
5ad37ce6a5 Return default image url on ActiveStorage errors in image loading 2023-06-14 12:53:20 +01:00
dependabot[bot]
6e9721b64c chore(deps): bump aws-sdk-s3 from 1.123.1 to 1.124.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.123.1 to 1.124.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>
 2023-06-14 09:58:54 +00:00
Matt-Yorkley
4c7e947738 Migrate data 
So it turns out all images uploaded before the ActiveStorage migration are internally set to "public-read", and all images uploaded after the migration are internally set to "private". This migration switches all images in S3 buckets back to "public-read".
 2023-06-14 10:56:10 +01:00