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
Luis Ramos
04feccaef3
Merge pull request #5863 from romale/patch-7
...
Missing translation key 'item', 'qty'
2020-08-07 09:22:34 +01:00
Pau Pérez Fabregat
dfc31b9338
Merge pull request #5864 from openfoodfoundation/dependabot/bundler/ddtrace-0.39.0
...
Bump ddtrace from 0.38.0 to 0.39.0
2020-08-07 08:22:17 +02:00
Pau Perez
2ccb7c3eb0
Point spree_paypal_express to its latest commit
...
This brings in the fix for the intermittent PayPal connection failures
due to SSL verification failed. Checkout that gem's commit for details.
2020-08-07 08:18:24 +02:00
Luis Ramos
6f17b80bb8
Move address factory modification to address_factory file and make it always create a state and country in the address if they dont exist in the DB
2020-08-06 10:11:47 +01:00
Transifex-Openfoodnetwork
f92d05656c
Updating translations for config/locales/en_FR.yml
2020-08-06 17:17:36 +10:00
Transifex-Openfoodnetwork
1e2c092b70
Updating translations for config/locales/fr.yml
2020-08-06 17:14:33 +10:00
Luis Ramos
43e64f3555
Delete dead code
2020-08-06 01:41:28 +01:00
Luis Ramos
73e1530a30
Fix specs
2020-08-06 01:35:09 +01:00
Luis Ramos
b09a9c5b8b
Fix easy rubocop issues
2020-08-06 01:22:31 +01:00
Luis Ramos
00ae3a25f7
Fix easy rubocop issues
2020-08-06 01:18:43 +01:00
Luis Ramos
14358256ed
Bring country, zone, state and zone_member from spree together with respective specs
2020-08-06 01:09:35 +01:00
dependabot-preview[bot]
6e626447d0
Bump ddtrace from 0.38.0 to 0.39.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.38.0 to 0.39.0.
- [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/v0.38.0...v0.39.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-05 23:48:20 +00:00
Luis Ramos
f14bb280c1
Merge pull request #5680 from cillian/prevent-blank-open-street-map
...
If no enterprises have been geocoded yet make sure Open Street Map displays correctly
2020-08-05 20:27:40 +01:00
Luis Ramos
f093656c6b
Merge pull request #5763 from luisramos0/mailers
...
Bring Mailers from Spree and make order shipped email translatable
2020-08-05 18:09:12 +01:00
romale
dd86e00913
Update en.yml
2020-08-05 18:17:14 +03:00
Transifex-Openfoodnetwork
b2309f8673
Updating translations for config/locales/en_FR.yml
2020-08-06 00:21:16 +10:00
Transifex-Openfoodnetwork
5404efcbce
Updating translations for config/locales/fr.yml
2020-08-06 00:21:09 +10:00
Luis Ramos
d8acf90240
Merge pull request #5770 from openfoodfoundation/revert-5601-enhancement/5454-links-to-shops-in-new-tabs
...
Revert "Enhancement/5454 make links to shops under Groups > Producers open in new tab"
2020-08-05 11:51:48 +01:00
Luis Ramos
6cc296926c
Merge pull request #5847 from rmklaus12/5579-missing-translation-subscriptions
...
5579 missing translation subscriptions
2020-08-05 11:29:34 +01:00
François Turbelin
8687e0199d
Apply cosmetics
2020-08-05 08:20:14 +02:00
Pau Pérez Fabregat
6e1dd78e9f
Merge pull request #5828 from luisramos0/ent_user
...
Clean up AuthenticationWorkflow spec helper
2020-08-04 12:07:54 +02:00
Pau Perez
6e39ab779c
Make RSpec infer the file type from its location
...
Apparently, although we tend to add the type of spec file some RSpec
methods are not working without it. We're getting:
```
NoMethodError:
undefined method `helper' for RSpec::ExampleGroups::SpreeSharedOrderDetailsHtmlHaml:Class
```
```
NameError:
undefined local variable or method `controller' for #<RSpec::ExampleGroups::SpreeAdminUsersController::AuthorizeAdmin:0x00007fa8b32addf8>
# ./spec/controllers/spree/admin/users_controller_spec.rb:10:in `block (3 levels) in <top (required)>'
```
It needs more investigation but another day.
2020-08-04 11:24:49 +02:00
