Luis Ramos
fcaa9d1b37
Remove extra space from base translations in closing and welcome to
2020-07-03 10:32:09 +01:00
Luis Ramos
63934b7863
Add space after translation so that translators dont have to guess a space is needed after the translation
2020-07-01 11:56:37 +01:00
Pau Pérez Fabregat
819af03239
Merge pull request #5706 from luisramos0/ent
...
Fix admin enterprises controller spec
2020-07-01 12:28:19 +02:00
Pau Pérez Fabregat
5a72526107
Merge pull request #5692 from luisramos0/taxonomies
...
Fix taxonomies flaky spec
2020-07-01 12:26:56 +02:00
Luis Ramos
2dce10bec2
Fix admin enterprises controller spec, for some reason the correct controller is not being picked up in the test
2020-06-30 10:49:45 +01:00
Pau Pérez Fabregat
e69d3e5e0c
Merge pull request #5693 from luisramos0/knapsack
...
Reload knapsack report
2020-06-30 09:43:36 +02:00
Pau Pérez Fabregat
2a1fe3f05f
Merge pull request #5684 from openfoodfoundation/dependabot/bundler/ddtrace-0.37.0
...
Bump ddtrace from 0.36.0 to 0.37.0
2020-06-30 09:41:48 +02:00
Luis Ramos
de8b97b2e1
Merge pull request #5526 from cillian/drop-blockenspiel
...
Drop blockenspiel
2020-06-29 20:09:26 +01:00
Matt-Yorkley
be0131b94c
Merge pull request #5645 from coopdevs/fix-scss-deprecation-warning
...
Rename *.css.scss to *.scss
2020-06-29 20:36:42 +02:00
Matt-Yorkley
bd0e4c75c4
Merge pull request #5636 from fatihorhan/make-user-guide-links-consistent
...
Update Sell page to use User Guide links from configuration
2020-06-29 20:33:00 +02:00
Cillian O'Ruanaidh
a9664e103d
Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes.
2020-06-29 18:11:08 +01:00
Luis Ramos
6516037420
Reload knapsack report
2020-06-27 20:36:33 +01:00
Luis Ramos
10b8c2b789
Relax the assertion and dont check row number so that it passes even if order of elements is not the same
2020-06-27 15:54:58 +01:00
dependabot-preview[bot]
032a70fa7e
Bump ddtrace from 0.36.0 to 0.37.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.36.0 to 0.37.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.36.0...v0.37.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-26 19:16:32 +00:00
Luis Ramos
5e3d7be545
Merge pull request #5630 from openfoodfoundation/dependabot/bundler/ransack-1.8.10
...
Bump ransack from 1.2.3 to 1.8.10
2020-06-26 13:37:03 +01:00
Luis Ramos
5929b9c1e5
Merge pull request #5627 from openfoodfoundation/dependabot/bundler/geocoder-1.6.3
...
[Security] Bump geocoder from 1.5.2 to 1.6.3
2020-06-25 20:34:19 +01:00
Luis Ramos
2ad2836ac6
Merge pull request #5563 from luchiago/fix-missing-closed-oc-info-i18n
...
add missing i18n key for closed OC
2020-06-25 20:33:55 +01:00
Luis Ramos
93a2e57bc6
Merge pull request #5538 from jeduardo824/bug/4592-payment-methods-table-in-dashboard
...
Fix Payment Methods table to show proper provider name
2020-06-25 20:32:04 +01:00
Luis Ramos
cb2ccf76d2
Merge pull request #5590 from rmklaus12/5558-shippingcategory-translation
...
Added translation key to config/locales/en.yml file for shipping_cat…
2020-06-25 20:31:48 +01:00
Luis Ramos
f44533bbd5
Merge pull request #5589 from rmklaus12/2617-mainmenu-translation
...
Added more key to en.yml to translate More dropdown text
2020-06-25 20:27:46 +01:00
Luis Ramos
bfc134c9e6
Merge pull request #5615 from openfoodfoundation/dependabot/bundler/acts-as-taggable-on-4.0.0
...
Bump acts-as-taggable-on from 3.5.0 to 4.0.0
2020-06-25 20:26:59 +01:00
Pau Pérez Fabregat
7338f196e9
Merge pull request #5663 from luisramos0/constraints
...
Make db timestamps nullable
2020-06-25 13:14:41 +02:00
Luis Ramos
68946a765e
Make timestamps nullable
2020-06-25 08:47:18 +01:00
Luis Ramos
9e39d970ca
Result of running db:migrate
2020-06-23 19:19:18 +01:00
Pau Pérez Fabregat
9e730e6445
Merge pull request #5660 from coopdevs/fix-spree-preferences
...
Migrate all spree pref. keys to the new format
2020-06-23 18:00:01 +02:00
Pau Perez
a81e17f23c
Flush the cache
...
So all preferences are fetch from DB now that they have changed.
2020-06-23 17:23:22 +02:00
Pau Perez
190797717a
Defend from the running the migration twice
...
We only migrate preferences if there are any to migrate.
2020-06-23 17:22:11 +02:00
Pau Perez
0ffa7b3734
Migrate all spree pref. keys to the new format
...
We realized in Spree v2.1 they follow this format instead and this is
what's causing issues to Katuma production.
This will remove the duplicate ones and convert the current preferences
to the new thus, keeping the values.
2020-06-23 16:21:20 +02:00
Pau Pérez Fabregat
973ea2ea2d
Merge pull request #5641 from openfoodfoundation/transifex
...
Transifex
2020-06-23 10:43:26 +02:00
Pau Pérez Fabregat
3939febc2f
Merge pull request #5653 from luisramos0/rubocop_refresher
...
Auto correct rubocop, refresh todo lists and fix some more rubocop issues
2020-06-23 10:25:59 +02:00
Luis Ramos
91fc0cd26f
Adapt specs to new Ar method update that replaces update_attributes
2020-06-22 17:39:20 +01:00
Luis Ramos
f004b3d573
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
b49eef5fa9
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
1c550a594f
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
0ba1642bd2
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
1e5975c6e2
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
aa14fd236c
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
ab59ab45f5
Use auto correct to fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
f54abbd376
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
730959f85f
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
8870dc4b06
Move rubocop exception to code
2020-06-22 17:39:20 +01:00
Luis Ramos
1b5f9f105a
Fix block alignment
2020-06-22 17:39:20 +01:00
Luis Ramos
ed5fc29c44
Fix hash alignment issue
2020-06-22 17:39:20 +01:00
Luis Ramos
ff68303ef6
Fix long lines
2020-06-22 17:39:20 +01:00
Luis Ramos
0f2e07cc2d
Fix long lines
2020-06-22 17:39:20 +01:00
Luis Ramos
0e3b5ad4c3
Revert rubocop auto correct because update! is a method in the adjustment model
2020-06-22 17:39:17 +01:00
Luis Ramos
41ff406e86
Fix rubocop issue by avoiding rails method name update_attributes
2020-06-22 16:51:46 +01:00
Luis Ramos
6a7ed6e0c9
Rebuild .rubocop_manual_todo.yml
2020-06-22 16:51:46 +01:00
Luis Ramos
4e9c21d525
Add new regenerated rubocop_todo
2020-06-22 16:51:46 +01:00
Luis Ramos
b879439d58
Use rubocop auto correct to fix Style/SafeNavigation issue
2020-06-22 16:51:46 +01:00
