Maikel Linke
90bf4f312b
Document and spec current controller behaviour
...
When we imported and merged Spree's controller modules with our
decorators, Rails started using Spree's original code again.
This was first included in v3.2.0 and deployed on 28 July 2020.
2020-08-13 16:59:15 +10:00
Maikel Linke
63a9765fea
Update rubocop todo lists
2020-08-13 16:33:47 +10:00
dependabot-preview[bot]
5c6cb4840e
Bump bugsnag from 6.15.0 to 6.16.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.15.0 to 6.16.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.15.0...v6.16.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-13 01:56:14 +00:00
Maikel Linke
271d1ec103
Update translations from Transifex
2020-08-13 10:52:55 +10:00
Maikel
2271a57ffe
Merge pull request #5880 from openfoodfoundation/transifex
...
Transifex
2020-08-13 10:35:00 +10:00
Andy Brett
7c223a43fc
remove unused key from en.yml
2020-08-12 12:59:38 -07:00
Andy Brett
d46fad3a02
remove map reference
2020-08-12 12:33:15 -07:00
Andy Brett
c75a864ff2
link to the enterprise's shop instead of a full map
2020-08-12 12:21:07 -07:00
François Turbelin
46d38930d9
Add some ajustements
2020-08-12 20:53:02 +02:00
François Turbelin
a4e8982351
Rename ProductsController into CatalogItemsController
2020-08-12 19:51:12 +02:00
François Turbelin
13e15f823e
Add Read action for Enterprise and CatalogItem
2020-08-12 19:43:20 +02:00
Transifex-Openfoodnetwork
95e048b37f
Updating translations for config/locales/en_CA.yml
2020-08-13 02:50:37 +10:00
François Turbelin
508ecd6bf7
Adjust with Rubocop suggestions
2020-08-12 13:46:23 +02:00
François Turbelin
d10fda6227
Put context inside serializer
2020-08-12 13:37:48 +02:00
François Turbelin
2a8268ca73
Use ActiveModelSerializer for DFC serialization
2020-08-12 13:37:01 +02:00
Maikel Linke
99ca0adf64
Remove unused dependency diffy
...
It was used to show differences in the product cache. But we removed the
cache in ab330e882e
2020-08-12 13:10:51 +10:00
Maikel
a8207128df
Merge pull request #5889 from Matt-Yorkley/suppress-selenium-warings
...
Suppress Selenium warnings in test log output.
2020-08-12 11:29:30 +10:00
Transifex-Openfoodnetwork
47bde1e77c
Updating translations for config/locales/tr.yml
2020-08-12 00:50:03 +10:00
Matt-Yorkley
0edeb82c32
Update spec/spec_helper.rb
...
Co-authored-by: Maikel <maikel@email.org.au >
2020-08-11 14:02:49 +02:00
julesemmac
dee34d1f26
adding required argument to resolve Places error
2020-08-10 23:19:21 -04:00
Transifex-Openfoodnetwork
acf984699e
Updating translations for config/locales/en_US.yml
2020-08-11 12:02:26 +10:00
Arun Kumar Mohan
13bf7497a9
Fix price translation in Bulk Order Management
2020-08-10 18:26:09 -05:00
Pau Pérez Fabregat
70e2fb759c
Merge pull request #5751 from luisramos0/subs_jobs
...
Add rescue statements with bugsnag alerts to subs jobs
2020-08-10 12:50:54 +02:00
Eduardo
a860b5ea42
remove unnecessary code
2020-08-09 20:45:33 -03:00
Matt-Yorkley
74252e9d13
Suppress Selenium warnings in test log output.
2020-08-09 14:02:07 +01:00
Luis Ramos
09b7aa134b
Ammend payment method spec and specify a calculator so that the default calculator is not the spree one that is based on a calculator that does not exist in OFN: Spree::Calculator::FlatRate
2020-08-07 18:36:59 +01:00
Luis Ramos
78fbac8ff2
Merge pull request #5882 from coopdevs/fix-doc-ocd
...
Fix docs OCD in Gemfile
2020-08-07 16:38:40 +01:00
Pau Perez
4e22787386
Fix docs OCD in Gemfile
...
@luisramos0 and I can't cope with reading TWO and seeing THREE items listed.
2020-08-07 17:20:14 +02:00
Transifex-Openfoodnetwork
f6c85af4da
Updating translations for config/locales/fr.yml
2020-08-08 00:21:32 +10:00
Luis Ramos
49a60374e6
Remove dead method in payment method, it's a scope in OFN and remove unnecessary comments about spree
2020-08-07 14:14:46 +01:00
Luis Ramos
2d3578bb30
Fix address_spec
2020-08-07 14:05:36 +01:00
Luis Ramos
1b66a72c7f
Run transpec
2020-08-07 14:03:15 +01:00
Luis Ramos
798194c03e
Fix payment_method spec
2020-08-07 14:02:05 +01:00
Luis Ramos
b21a969502
Fix new credit_card_spec
2020-08-07 13:45:25 +01:00
Luis Ramos
d746ae3d9e
Fix easy rubocop issues
2020-08-07 13:28:09 +01:00
Luis Ramos
621e2a3132
Run rubocop autocorrect
2020-08-07 13:16:38 +01:00
Luis Ramos
142bab8c35
Merge decorators with original spree files
2020-08-07 13:13:43 +01:00
Luis Ramos
abaa66cc14
Bring models from spree_core
2020-08-07 13:06:16 +01:00
Matt-Yorkley
1123e08a98
Update BugsnagJS to latest version and update initialization syntax
2020-08-07 12:59:33 +01:00
Luis Ramos
02f50774bb
Run transpec
2020-08-07 12:47:44 +01:00
Luis Ramos
ff8735d7a4
Make new specs pass
2020-08-07 12:45:06 +01:00
Luis Ramos
51a499d5c9
Revert rubocop autocorrect so that spec keeps working
2020-08-07 10:45:15 +01:00
Matt-Yorkley
3a2802f5aa
Merge pull request #5871 from coopdevs/fix-paypal-ssl-error
...
Point better_spree_paypal_express to its latest commit
2020-08-07 11:43:52 +02:00
Luis Ramos
086c521a27
Fix easy rubocop issues
2020-08-07 10:28:41 +01:00
Luis Ramos
7cefdda579
Run rubocop autocorrect
2020-08-07 10:21:09 +01:00
Luis Ramos
ba859111de
Merge decorators with original files brought from spree
2020-08-07 10:17:30 +01:00
Luis Ramos
fd9479f720
Bring modesl from spree_core
2020-08-07 10:06:08 +01:00
Luis Ramos
0c7a0e3e96
Bring modesl from spree_core
2020-08-07 10:06:04 +01:00
Matt-Yorkley
766b7449d8
Update all locales with the latest Transifex translations
2020-08-07 10:00:21 +01:00
Matt-Yorkley
2caa559869
Merge pull request #5860 from openfoodfoundation/transifex
...
Transifex
2020-08-07 10:58:25 +02:00
