Commit Graph

  • 5f64204d51 Merge branch 'master' into fix-docker-dependency-and-db-dev-env Gareth Rogers 2025-08-22 08:31:27 -04:00
  • 94b75540e4 Replace Timecop with Rails' time helpers Maikel Linke 2025-08-14 14:57:32 +10:00
  • 6e489d7770 Enforce required DFC permissions Maikel Linke 2025-08-22 16:46:59 +10:00
  • 81b1169e77 Configure undercover to exclude files Maikel Linke 2025-08-14 11:16:53 +10:00
  • 4b558b4820 Merge pull request #13501 from openfoodfoundation/dependabot/npm_and_yarn/sha.js-2.4.12 Maikel 2025-08-22 16:12:26 +10:00
  • e224b8f63b Merge pull request #13500 from openfoodfoundation/dependabot/npm_and_yarn/cipher-base-1.0.6 Maikel 2025-08-22 16:11:30 +10:00
  • 80bb0606b4 Merge pull request #13499 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.7.4 Maikel 2025-08-22 15:50:47 +10:00
  • 499fcc791e Bump sha.js from 2.4.11 to 2.4.12 dependabot[bot] 2025-08-21 15:48:41 +00:00
  • 30dae3c3ea Bump cipher-base from 1.0.4 to 1.0.6 dependabot[bot] 2025-08-21 15:23:41 +00:00
  • af247c32a3 Bump @floating-ui/dom from 1.7.3 to 1.7.4 dependabot[bot] 2025-08-21 09:48:24 +00:00
  • 6f9dcf7e27 remove bundle check Gareth 2025-08-20 11:04:40 -04:00
  • 2d064bab64 Created a bundler service that runs once removing responsibilities from any other services. The bundler service always runs install which should still be pretty fast if nothing or only a few gems have changed. A healthcheck won't work unless bundler runs continuously which is impractical. Instead, a checksum is generated on bundle install and sentinels in the other services have a definite confirmation that bundle is complete. The nice thing about this approach is that web, webpack, and sidekiq (which share the same bundles dependencies) will not concurrently run bundle install solving dep install redundancies. Gareth 2025-08-20 10:13:20 -04:00
  • b69eb9bdff Specified BUNDLE_PATH AND BUNDLE_APP_CONFIG in Dockerfile Gareth 2025-08-20 08:48:21 -04:00
  • f79c1879bd Test that you can actually get to Stripe to connect your account David Cook 2025-08-20 12:32:31 +10:00
  • 646d538a3d Fix broken link David Cook 2025-08-20 11:54:47 +10:00
  • 90288b8cbf Merge pull request #13492 from chahmedejaz/revert/dependabot/bundler/rexml-3.3.9 v5.2.2 David Cook 2025-08-19 10:50:09 +10:00
  • c821b0a285 revert "Bump rexml from 3.2.9 to 3.3.9" Ahmed Ejaz 2025-08-19 05:27:58 +05:00
  • b95d798a27 Fixed webpack service so that web relies on its bundles. This has re-enabled JS Gareth 2025-08-18 12:24:27 -04:00
  • e1e4aeac1f Added conditions to sidekiq too as it races db as well. Everything seems functional now Gareth 2025-08-18 11:52:52 -04:00
  • c7ae47053e Added health check to avoid docker container racing Gareth 2025-08-18 11:38:57 -04:00
  • 5892ae1800 Merge branch 'master' into fix-docker-dependency-and-db-dev-env Gareth Rogers 2025-08-18 09:32:21 -04:00
  • c37376d67e Merge pull request #13485 from openfoodfoundation/dependabot/bundler/bullet-8.0.8 Gaetan Craig-Riou 2025-08-18 13:58:39 +10:00
  • d3a2c09f66 Upgrade to postgres 16 Gaetan Craig-Riou 2025-08-18 10:45:54 +10:00
  • d596e692d8 Upgrade postgres to version 14 Gaetan Craig-Riou 2025-08-11 12:05:58 +10:00
  • 2df95dcbab No need to expose the postgres port Gaetan Craig-Riou 2025-08-11 11:58:02 +10:00
  • 7aa9b164e6 Add scope for ordering products by stock levels and update admin table header for on_hand sorting Ahmed Ejaz 2025-08-17 07:16:46 +05:00
  • 74368f939b By creating the db in the container on composition, the first migration file rejects the schema of the empty database. All I had to do was remove db creation from docker so that db:prepare will default to creating open_food_network_dev from schema.rb rather than perceiving a mismatch from the precreated docker db Gareth 2025-08-15 14:23:13 -04:00
  • cb02cd39fe Reverting unexpected change to schema.rb as requested Gareth 2025-08-15 12:27:10 -04:00
  • 49ec5b2089 Bump bullet from 7.1.6 to 8.0.8 dependabot[bot] 2025-08-15 09:56:17 +00:00
  • 92ef5fe3d5 Merge pull request #13483 from openfoodfoundation/dependabot/bundler/pdf-reader-2.15.0 v5.2.1 Maikel 2025-08-15 10:29:09 +10:00
  • ae477b7e52 Merge pull request #13455 from kirst-n/13366-only-load-necessary-flatpickr Filipe 2025-08-14 23:24:59 +01:00
  • 0e191e5fca Merge pull request #13459 from rioug/13454-fix-redeemeing-voucher-when-using-paypal Filipe 2025-08-14 16:30:22 +01:00
  • 64f9ea6fc0 Bump pdf-reader from 2.12.0 to 2.15.0 dependabot[bot] 2025-08-14 10:01:32 +00:00
  • 058c6749da Merge pull request #13477 from openfoodfoundation/dependabot/bundler/timecop-0.9.10 Maikel 2025-08-14 13:20:18 +10:00
  • 2d15ec4458 Merge pull request #13478 from openfoodfoundation/dependabot/bundler/activerecord-7.1.5.2 Maikel 2025-08-14 13:18:58 +10:00
  • 56eaa8bb98 Bump activerecord from 7.1.5.1 to 7.1.5.2 dependabot[bot] 2025-08-14 01:21:32 +00:00
  • 118e18a78e Tighten url validation Gaetan Craig-Riou 2025-08-13 22:27:42 +10:00
  • cbced144d5 Clean up styling Gaetan Craig-Riou 2025-08-13 22:21:35 +10:00
  • 1e1f1e1e1b Bump timecop from 0.9.8 to 0.9.10 dependabot[bot] 2025-08-13 09:58:01 +00:00
  • 1d2115766a Show product groups to platform user Maikel Linke 2025-08-13 12:01:10 +10:00
  • 6814ef43f4 Show addresses to platform users Maikel Linke 2025-08-07 16:48:08 +10:00
  • c9e8294561 DRY with shared context Maikel Linke 2025-08-07 16:33:44 +10:00
  • 82d0e1bf68 Show enterprise to authorised platform user Maikel Linke 2025-08-07 16:05:08 +10:00
  • b16e541a81 Show DFC catalog to authorised platform Maikel Linke 2025-08-07 15:19:07 +10:00
  • c12d494de3 Demonstrate authentication as DFC client app Maikel Linke 2025-08-07 13:51:43 +10:00
  • 9be27842e1 Accepts tokens from Startin'Blox OIDC server Maikel Linke 2025-06-13 15:14:54 +10:00
  • 2a7754edbf Add test for current token validation Maikel Linke 2025-06-13 14:24:27 +10:00
  • cfeafbfc51 Update API docs with latest version Maikel Linke 2025-08-13 11:55:41 +10:00
  • 1f8a9f9c76 Merge pull request #13470 from openfoodfoundation/dependabot/bundler/rack-2.2.14 Maikel 2025-08-13 12:45:59 +10:00
  • b1893942ac Merge pull request #13469 from openfoodfoundation/dependabot/bundler/net-imap-0.4.20 Maikel 2025-08-13 12:40:50 +10:00
  • ad59ed4d40 Bump rack from 2.2.11 to 2.2.14 dependabot[bot] 2025-08-13 00:02:14 +00:00
  • 8491a167ed Merge pull request #13350 from mkllnk/dfc-ui Maikel 2025-08-13 10:00:53 +10:00
  • 05b00f16ad Move config option to a better place Maikel Linke 2025-08-12 16:19:45 +10:00
  • 78fdaa68c8 Update config files with Rails 7.1 templates Maikel Linke 2025-08-12 16:13:36 +10:00
  • 59277292fb Bump net-imap from 0.4.10 to 0.4.20 dependabot[bot] 2025-08-12 06:54:11 +00:00
  • e8813833fa Add Rails 7.1 framework defaults template Maikel Linke 2025-08-12 15:43:45 +10:00
  • 354a7ab687 Merge pull request #13465 from openfoodfoundation/dependabot/bundler/fugit-1.11.1 Gaetan Craig-Riou 2025-08-12 15:06:20 +10:00
  • a5a1ee9bd9 Merge pull request #13462 from openfoodfoundation/dependabot/bundler/thor-1.4.0 Gaetan Craig-Riou 2025-08-12 15:02:23 +10:00
  • ad3f78ef69 Merge pull request #13466 from openfoodfoundation/dependabot/bundler/uri-0.13.2 Gaetan Craig-Riou 2025-08-12 14:58:40 +10:00
  • e02497b163 Merge pull request #13467 from openfoodfoundation/dependabot/bundler/rails-html-sanitizer-1.6.1 Gaetan Craig-Riou 2025-08-12 14:57:59 +10:00
  • 7d2d94398f Merge pull request #13464 from openfoodfoundation/dependabot/bundler/cgi-0.3.7 Gaetan Craig-Riou 2025-08-12 14:49:47 +10:00
  • 0ecf004ff2 Merge pull request #13463 from openfoodfoundation/dependabot/bundler/rexml-3.3.9 Gaetan Craig-Riou 2025-08-12 14:48:06 +10:00
  • 444f448207 Bump rails-html-sanitizer from 1.6.0 to 1.6.1 dependabot[bot] 2025-08-12 04:31:53 +00:00
  • d9381b23d7 Bump uri from 0.13.0 to 0.13.2 dependabot[bot] 2025-08-12 04:31:50 +00:00
  • 6a9a2884d6 Bump fugit from 1.8.1 to 1.11.1 dependabot[bot] 2025-08-12 04:31:11 +00:00
  • 70edd4b898 Bump cgi from 0.3.6 to 0.3.7 dependabot[bot] 2025-08-12 04:31:07 +00:00
  • b57a2befd9 Bump rexml from 3.2.9 to 3.3.9 dependabot[bot] 2025-08-12 04:27:20 +00:00
  • fef9a78198 Bump thor from 1.3.1 to 1.4.0 dependabot[bot] 2025-08-12 04:24:48 +00:00
  • dd86736170 Merge pull request #13461 from openfoodfoundation/dependabot/bundler/webrick-1.8.2 Maikel 2025-08-12 13:54:23 +10:00
  • 0d8c7ef118 Merge pull request #13460 from openfoodfoundation/dependabot/bundler/nokogiri-1.18.9 Maikel 2025-08-12 13:52:57 +10:00
  • 20730b8768 Bump webrick from 1.8.1 to 1.8.2 dependabot[bot] 2025-08-12 03:43:07 +00:00
  • ad7c69189b Bump nokogiri from 1.16.5 to 1.18.9 dependabot[bot] 2025-08-12 03:22:15 +00:00
  • a5f44cb9b2 Update inflection config to Rails 7.0 template Maikel Linke 2025-08-12 12:49:06 +10:00
  • 97d21d8cbe Update parameter filtering to Rails 7.0 template Maikel Linke 2025-08-12 12:45:48 +10:00
  • 7afdd13b64 Update CSP config with Rails 7.0 template Maikel Linke 2025-08-12 12:41:24 +10:00
  • 54c446f0a3 Update asset config to Rails 7.0 templates Maikel Linke 2025-08-12 12:30:30 +10:00
  • 4454c90575 Update test config with Rails 7.0 template Maikel Linke 2025-08-12 12:22:23 +10:00
  • dd3a61acdf Update production config with Rails 7.0 default Maikel Linke 2025-08-12 12:07:56 +10:00
  • 6d8ddd1eda Update development config with Rails 7.0 defaults Maikel Linke 2025-08-12 11:39:43 +10:00
  • b8e8ab15d1 Update environment config with Rails 7.0 default Maikel Linke 2025-08-12 11:06:33 +10:00
  • bf1d2f3620 Update boot config from Rails 7.0 template Maikel Linke 2025-08-12 10:59:46 +10:00
  • 43026ddc6a Update application config with Rails 7.0 defaults Maikel Linke 2025-08-12 10:56:34 +10:00
  • 18b83d2423 Add Rails 7.0 framework defaults templates Maikel Linke 2025-08-12 10:40:39 +10:00
  • 3a72aefc1c Fail test when timeout reached Maikel Linke 2025-08-12 09:54:48 +10:00
  • e855ea0dbd Merge pull request #13453 from mkllnk/rails-7.1 David Cook 2025-08-12 09:44:25 +10:00
  • 1eba950e19 Merge pull request #13451 from mkllnk/remove-person David Cook 2025-08-12 09:42:40 +10:00
  • 9cd04c087e Merge pull request #13450 from mkllnk/engine-ruby-version David Cook 2025-08-12 09:40:01 +10:00
  • 459d25e533 Merge pull request #13447 from mkllnk/cover-rake David Cook 2025-08-12 09:37:51 +10:00
  • b06e562425 Remove flatpickr controller test that isn't useful based on feedback Kirst 2025-08-11 20:23:36 +10:00
  • 2936cfebca Remove I18n assignment from flatpickr controller test from feedback Kirst 2025-08-11 20:20:36 +10:00
  • b8ad428b5d Load only specified flatpickr locale Kirst 2025-08-11 16:04:11 +10:00
  • ca34d24847 Replace long waits with better polling Maikel Linke 2025-08-11 17:07:42 +10:00
  • 6e581fce75 Remove unnecessary styling Maikel Linke 2025-08-11 16:29:08 +10:00
  • 66041061fb Redeem VINE voucher before redirecting to payment url Gaetan Craig-Riou 2025-08-11 15:54:58 +10:00
  • e54c27c900 Use more precise regex Maikel Linke 2025-08-11 16:23:08 +10:00
  • b3d3d6bf06 Allow DPM feature for specific users Maikel Linke 2025-08-11 15:25:50 +10:00
  • 5876c52318 Test all known scopes Maikel Linke 2025-08-11 15:15:00 +10:00
  • 842f4ae40e Re-enable CSRF check supported by DPM now Maikel Linke 2025-08-11 15:13:35 +10:00
  • 342ef4e9eb Complete smoke test of DFC data sharing Maikel Linke 2025-07-29 16:57:06 +10:00
  • 210201514e Add gem capybara-shadowdom to access web component Maikel Linke 2025-07-29 15:49:11 +10:00