Andy Brett
473ac820aa
Merge pull request #6676 from openfoodfoundation/transifex
...
Transifex
2021-01-18 13:34:44 -08:00
Pau Pérez Fabregat
c9d2149ef9
Merge pull request #6688 from coopdevs/remove-unneeded-deprecation-warning
...
Remove old deprecation warning
2021-01-18 21:06:56 +01:00
Pau Pérez Fabregat
cd7ba2c62b
Merge pull request #6690 from coopdevs/update-static-files-config
...
Update old setting to serve static assets
2021-01-18 18:05:44 +01:00
Pau Perez
fd80d4a67f
Remove old deprecation warning
...
We're in Rails 4.2 so we can remove it. This gets rid of the following
message when running tests:
```
DEPRECATION WARNING: Suppressing Selenium deprecation warnings is not needed any more. (called from block in <top (required)> at /usr/src/app/spec/spec_helper.rb:214)
```
2021-01-18 17:01:43 +01:00
Pau Perez
006abee23d
Update old setting to serve static assets
...
Fixes the following deprecation warning:
```
DEPRECATION WARNING: The configuration option `config.serve_static_assets` has been renamed to `config.serve_static_files` to clarify its role (it merely enables serving everything in the `public` folder and is unrelated to the asset pipeline). The `serve_
static_assets` alias will be removed in Rails 5.0. Please migrate your configuration files accordingly. (called from block in <top (required)> at /usr/src/app/config/environments/test.rb:13)
```
2021-01-18 17:01:33 +01:00
Pau Pérez Fabregat
158aa78f89
Merge pull request #6692 from Matt-Yorkley/deliver-specs
...
Update mail delivery mocks in subscription specs
2021-01-18 16:41:02 +01:00
Matt-Yorkley
bc9020a555
Update mail delivery mocks in subscription specs
2021-01-18 12:27:07 +00:00
Andy Brett
1287cb1e56
Merge pull request #6686 from Matt-Yorkley/devise-spec-helper
...
Update deprecated devise spec helper
2021-01-17 19:57:49 -08:00
Andy Brett
ca022e505a
Merge pull request #6684 from Matt-Yorkley/subs-delivery
...
Use deliver_now in Jobs
2021-01-16 09:11:25 -08:00
Matt-Yorkley
a7ad62a735
Update deprecated devise spec helper
...
Devise has been complaining about this for a while in the test suite:
```
[Devise] including `Devise::TestHelpers` is deprecated and will be removed from Devise.
For controller tests, please include `Devise::Test::ControllerHelpers` instead.
```
2021-01-16 13:54:09 +00:00
Matt-Yorkley
b713219690
Use deliver_now in Jobs
2021-01-16 13:19:00 +00:00
Andy Brett
2c405a5705
Merge pull request #6672 from Matt-Yorkley/update-hooks
...
Delete dead code #update_hooks
2021-01-15 19:03:14 -08:00
Matt-Yorkley
5593da2928
Delete dead code #update_hooks
...
These hooks allow Spree core to be modified by other gems and apps without changing Spree code. We don't use it. #YAGNI
2021-01-15 16:49:45 +00:00
Andy Brett
f179214920
Merge pull request #6677 from Matt-Yorkley/remove-debugging
...
Remove debugging code from spec
2021-01-15 08:30:00 -08:00
Transifex-Openfoodnetwork
8f8f430e87
Updating translations for config/locales/en_CA.yml
2021-01-16 02:04:42 +11:00
Transifex-Openfoodnetwork
6be14dfb29
Updating translations for config/locales/fr_CA.yml
2021-01-16 01:58:02 +11:00
Matt-Yorkley
c870af8981
Remove debugging output.
2021-01-15 13:21:03 +00:00
Transifex-Openfoodnetwork
c132a5351f
Updating translations for config/locales/it.yml
2021-01-15 23:46:42 +11:00
Transifex-Openfoodnetwork
dc76f161a3
Updating translations for config/locales/es.yml
2021-01-15 23:42:27 +11:00
Transifex-Openfoodnetwork
26e817818f
Updating translations for config/locales/ca.yml
2021-01-15 23:34:40 +11:00
Pau Pérez Fabregat
5129611cff
Merge pull request #6668 from luisramos0/disable_cache_instrumentation
...
[Rails 5] Make app startup in rails 5 and update Gemfile_next.lock
2021-01-15 13:15:07 +01:00
Pau Pérez Fabregat
f240402c43
Merge pull request #6654 from Matt-Yorkley/update-without-callbacks
...
Remove #update_attributes_without_callbacks
2021-01-15 12:24:42 +01:00
Andy Brett
9639c2af57
Update all locales with the latest Transifex translations
2021-01-14 17:24:42 -08:00
Andy Brett
cd383189c9
Merge pull request #6667 from openfoodfoundation/transifex
...
Transifex
2021-01-14 17:11:20 -08:00
Luis Ramos
209e2f20c5
Add rails 5 version for js template helpers
2021-01-15 00:23:37 +00:00
Luis Ramos
bc2d966e5f
Remove commented code
2021-01-15 00:22:20 +00:00
Luis Ramos
874da929d3
Disable db2fog in rails 5, it doesnt work, we need to find an alternative for rails 5
2021-01-15 00:21:28 +00:00
Luis Ramos
02a1116fff
Remove cache intrumentation
...
It doesnt work in rails 5 and apparently it was introduced to debug already deleted products cache in staging
See this commit that introduced it 10a79d5a65
2021-01-14 23:45:05 +00:00
Luis Ramos
d06c1fa665
Update Gemfile_next.lock
2021-01-14 23:44:09 +00:00
Maikel
d16bfbad93
Merge pull request #6662 from luisramos0/action_dispatch
...
First rails 5 upgrade PR with dual boot: remove action_dispatch/request if on rails 5 so we can boot the app in rails 5
2021-01-15 10:17:05 +11:00
Maikel
52b417877a
Merge pull request #6660 from openfoodfoundation/dependabot/bundler/webmock-3.11.1
...
Bump webmock from 3.11.0 to 3.11.1
2021-01-15 09:52:10 +11:00
Andy Brett
7ca81f45d0
Merge pull request #6641 from Matt-Yorkley/shipping-method-soft-deletion
...
Ensure ShippingMethod is correctly using soft-deletion
2021-01-14 11:53:19 -08:00
Transifex-Openfoodnetwork
3610827869
Updating translations for config/locales/en_GB.yml
2021-01-15 06:42:28 +11:00
Transifex-Openfoodnetwork
a0ee8cb1b3
Updating translations for config/locales/en_FR.yml
2021-01-15 06:01:40 +11:00
Andy Brett
18dcbbd892
Merge pull request #6613 from Matt-Yorkley/variant-override-serialization
...
Don't serialize all variant override objects where they are not needed
2021-01-14 10:59:11 -08:00
Transifex-Openfoodnetwork
577be5f70b
Updating translations for config/locales/fr.yml
2021-01-15 05:57:20 +11:00
Andy Brett
81ea71af94
Merge pull request #6652 from jibees/6651-remove-trailing-asterisk-on-non-mandatory-field
...
remove asterisk on 'display as' field unit value for a product
2021-01-14 10:09:15 -08:00
Pau Pérez Fabregat
929ae82e00
Merge pull request #6574 from Matt-Yorkley/bye-bye-spree-paypal
...
Bye Bye Spree Paypal
2021-01-14 18:16:44 +01:00
Pau Pérez Fabregat
9689fe2edf
Merge pull request #6384 from andrewpbrett/fix-product-descriptions
...
correctly display '&' and ' ' in product descriptions
2021-01-14 17:00:16 +01:00
Luis Ramos
82b2777cb3
Remove action_dispatch/request if on rails 5 so we can boot the app in rails 5
2021-01-14 09:48:59 +00:00
Pau Pérez Fabregat
9db4f9be15
Merge pull request #6634 from Matt-Yorkley/jobs-cleanup
...
Jobs cleanup
2021-01-14 10:08:15 +01:00
Pau Pérez Fabregat
85e932274d
Merge pull request #6442 from luisramos0/rails5-dualboot
...
Rails 5 upgrade with dualboot
2021-01-14 10:00:54 +01:00
Maikel
168958311a
Merge pull request #6656 from Matt-Yorkley/payment-identifier
...
Fix payment identifier generation
2021-01-14 17:34:38 +11:00
Maikel
fbda1fffd7
Merge pull request #6653 from Matt-Yorkley/dead-code-available-payment
...
Dead code: #has_available_payment
2021-01-14 17:33:07 +11:00
Maikel
50472d18e0
Merge pull request #6642 from coopdevs/doc-customer-serializer
...
Doc customer serializer
2021-01-14 17:28:34 +11:00
Maikel
14842f52fc
Merge pull request #6633 from Matt-Yorkley/inverse-of
...
Adding inverse_of
2021-01-14 17:25:51 +11:00
dependabot[bot]
3cee999032
Bump webmock from 3.11.0 to 3.11.1
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.11.0...v3.11.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-01-14 05:42:02 +00:00
Andy Brett
08d9ef5832
rename spec file; add test for nil content
2021-01-13 21:01:12 -08:00
Andy Brett
bbd7fd0350
handle nil product descriptions
2021-01-13 20:57:27 -08:00
Matt-Yorkley
5f2dc38241
Merge pull request #6098 from brymut/item-counter-fix
...
Fix #5989 Item counter accepts higher amount than available stock
2021-01-13 22:33:08 +01:00
