Pau Pérez Fabregat
8b01c9c8ba
Merge pull request #6279 from luisramos0/base_controller
...
Merge Spree::BaseController with ApplicationController and merge StoreController with ::BaseController
2021-01-19 15:52:47 +01:00
Matt-Yorkley
79b86f535d
Move class definitions in adjustment migration
2021-01-19 13:33:37 +00:00
Luis Ramos
8007554176
Remove test_after_commit gem, it's baked into rails 5 now
2021-01-19 01:15:43 +00:00
Luis Ramos
fc40775ca8
Make paypal controller inherit from base controller and not from old store controller
2021-01-18 23:33:05 +00:00
Maikel
334e270a11
Merge pull request #6552 from Matt-Yorkley/adjustments-order-association
...
[Adjustments] Associate all adjustments with an order
2021-01-19 08:43:13 +11:00
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
dependabot[bot]
d1eea4654a
Bump monetize from 1.9.4 to 1.10.0
...
Bumps [monetize](https://github.com/RubyMoney/monetize ) from 1.9.4 to 1.10.0.
- [Release notes](https://github.com/RubyMoney/monetize/releases )
- [Changelog](https://github.com/RubyMoney/monetize/blob/master/CHANGELOG.md )
- [Commits](https://github.com/RubyMoney/monetize/commits )
Signed-off-by: dependabot[bot] <support@github.com >
2021-01-18 16:10:24 +00: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
Luis Ramos
d8436c2dab
Downgrade libv8 so that mini racer keeps working
2021-01-16 22:41:50 +00: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
ea9ebc8a33
Update Angular CSRF handling
2021-01-16 13:41:24 +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
Luis Ramos
7c9024101b
Some css fixes to make it all work in rails 5
2021-01-15 23:26:37 +00:00
Luis Ramos
4060e7debf
Replace usages of Spree::BaseController with ApplicationController
2021-01-15 21:59:16 +00:00
Luis Ramos
7a22367b4a
Make controllers use ::Basecontroller instead of StoreController
2021-01-15 21:59:16 +00:00
Luis Ramos
23e6048bde
Merge StoreController with BaseController
2021-01-15 21:59:16 +00:00
Luis Ramos
ff8a81cee7
Remove includes already present in parent ApplicationController
2021-01-15 21:59:16 +00:00
Luis Ramos
0eab1b2339
Merge Spree::BaseController with ApplicationController
2021-01-15 21:59:16 +00:00
Matt-Yorkley
c0c7c6ec78
Update checkout helper summing and add test coverage
2021-01-15 17:29:21 +00: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
Matt-Yorkley
1eb08ba31c
Define basic models in migration
2021-01-15 16:17:18 +00: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
8cc4c6a63f
Introduce soft-deprecation strategy when modifying tax rates
...
If an admin changes the amount on a tax rate, and that rate has been used by adjustments in the past, we need to soft-delete and clone it to preserve the data integrity of previous adjustments that were created using that rate.
2021-01-15 13:38:03 +00: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
Cillian O'Ruanaidh
79668e06a7
Remove ability to create new product from products page, use /admin/products/new instead.
...
It's simpler if there is just one place to add a new product. Closes #6650
This removes the 'creating directly from the new product path' test scenario because we have another 'assigning important attributes' scenario above which provides enough coverage.
2021-01-15 10:24:50 +00:00
Cillian O'Ruanaidh
110d692ffa
Include the 'Ready for' time for the order cycle in the Notify Producers Email
...
This is so people can distinguish which order cycle the email is referring to. Fixes #6371
2021-01-15 09:24:05 +00:00
dependabot[bot]
8e4e276995
Bump paypal-sdk-merchant from 1.106.1 to 1.117.2
...
Bumps [paypal-sdk-merchant](https://github.com/paypal/merchant-sdk-ruby ) from 1.106.1 to 1.117.2.
- [Release notes](https://github.com/paypal/merchant-sdk-ruby/releases )
- [Changelog](https://github.com/paypal/merchant-sdk-ruby/blob/master/ChangeLog.txt )
- [Commits](https://github.com/paypal/merchant-sdk-ruby/compare/v1.106.1...v1.117.2 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-01-15 05:49:20 +00: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
