raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,947 Commits 21 Branches 450 Tags
7d71f217536acf2b65d6bdce85bfe11ea53267f3
Commit Graph

13947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
7d71f21753 Add frozen_string_literal comment to new class 2020-02-04 11:11:24 +01:00
Matt-Yorkley
285c78a5e4 Remove use of #pluck and ensure subquery does not include all columns 2020-02-04 11:10:13 +01:00
Matt-Yorkley
5f3abbf00e Refactor BaseController 2020-01-22 12:17:23 +01:00
Matt-Yorkley
a02c58e231 Add join_table to enterprise groups relation 
has_and_belongs_to_many relationships now require a join_table
 2020-01-22 12:17:23 +01:00
Matt-Yorkley
59ebfb9bd4 Fix subquery errors triggered by #warn_invalid_order_cycles 2020-01-22 12:17:23 +01:00
Matt-Yorkley
57ca1d54bb Fix issue with each_serializer not being called in some cases in Rails 4. 2020-01-22 12:17:23 +01:00
Luis Ramos
6bb4f2477c Merge pull request #4586 from luisramos0/states_erb 
Make states/new.js template depend on the states/new.haml template in OFN (not the states/new.erb in spree)
 2020-01-21 22:47:28 +00:00
Luis Ramos
1c3fd26eef Merge pull request #4655 from Matt-Yorkley/mobile-shoptabs 
Mobile: shop tabs
 2020-01-20 08:51:59 +00:00
Matt-Yorkley
f8145f8429 Update shop tab button styling in mobile 2020-01-19 15:59:37 +01:00
Matt-Yorkley
a1256f9aeb Remove old green box styling from shopfront messages 2020-01-19 15:57:01 +01:00
Luis Ramos
dd9f2a063f Merge pull request #4682 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.9 
Bump mini_racer from 0.2.4 to 0.2.9
 2020-01-17 13:36:02 +00:00
Luis Ramos
4973bcb9b6 Merge pull request #4677 from openfoodfoundation/dependabot/bundler/oj-3.10.1 
Bump oj from 3.10.0 to 3.10.1
 2020-01-17 13:14:15 +00:00
Maikel
9ee701bec1 Merge pull request #4683 from openfoodfoundation/dependabot/bundler/webmock-3.8.0 
Bump webmock from 3.7.6 to 3.8.0
 2020-01-17 09:14:50 +11:00
Maikel
e2469ded9a Merge pull request #4680 from openfoodfoundation/transifex 
Transifex
 2020-01-17 09:03:10 +11:00
dependabot-preview[bot]
eaa914a360 Bump webmock from 3.7.6 to 3.8.0 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.6 to 3.8.0.
- [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.7.6...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-16 19:19:26 +00:00
dependabot-preview[bot]
ea2fa9913d Bump mini_racer from 0.2.4 to 0.2.9 
Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.2.4 to 0.2.9.
- [Release notes](https://github.com/discourse/mini_racer/releases)
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG)
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.4...v0.2.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-16 19:15:52 +00:00
Matt-Yorkley
b69b5ea81a Merge pull request #4678 from mkllnk/4490-tag-rules-spec 
4490 tag rules spec
 2020-01-16 14:28:37 +01:00
Luis Ramos
18b3a8122d Merge pull request #4508 from luisramos0/backend_ctrl_prods_vars 
Bring spree_backend products and variants controllers to OFN
 2020-01-16 13:01:31 +00:00
luisramos0
1e203ae419 Remove destroy with js format in variants controller, we dont use this endpoint in OFN and it avoids having to bring additional code from spree_backend 2020-01-16 11:59:36 +00:00
luisramos0
70a24b25e2 Update rubocop manual todo and Remove some unnecessary comments 2020-01-16 11:59:36 +00:00
luisramos0
f7490ae28b Remove unused stock and destroy actions and bring product routes from spree_backend 2020-01-16 11:58:59 +00:00
luisramos0
836abbec92 Fix rubocop issues in variant controller 2020-01-16 11:58:59 +00:00
luisramos0
d153237b69 Merge variants decorator with controller 2020-01-16 11:58:59 +00:00
luisramos0
56b6bf82bb Fix some rubocop issues 2020-01-16 11:58:59 +00:00
luisramos0
0d44f298fe Merge spree/admin/products_controller with its decorator 2020-01-16 11:58:59 +00:00
luisramos0
ff3611f52a Add variants_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-01-16 11:58:59 +00:00
luisramos0
7fa9b4699c Add products_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-01-16 11:58:59 +00:00
Transifex-Openfoodnetwork
3dadb7f91c Updating translations for config/locales/en_GB.yml 2020-01-16 20:12:18 +11:00
Transifex-Openfoodnetwork
dd5c867298 Updating translations for config/locales/en_GB.yml 2020-01-16 20:09:10 +11:00
Transifex-Openfoodnetwork
918a0f053d Updating translations for config/locales/ar.yml 2020-01-16 18:25:27 +11:00
Transifex-Openfoodnetwork
2171125e85 Updating translations for config/locales/ar.yml 2020-01-16 18:22:18 +11:00
Transifex-Openfoodnetwork
5d0cb3549a Updating translations for config/locales/ar.yml 2020-01-16 18:19:07 +11:00
Maikel Linke
12fde5b9fc Update all locales with the latest Transifex translations v2.7.0 2020-01-16 15:28:57 +11:00
Maikel Linke
6b18d4a60c Avoid false positives in specs 
When switching from one tab to another, a `have_no_selector` check could
match because the new tab hasn't loaded yet. Now we use that check after
we verified other content on the new tab.
 2020-01-16 15:10:25 +11:00
Maikel Linke
4d53f47d88 Leave tag rules spec in clean state 2020-01-16 15:10:25 +11:00
Maikel Linke
3a9aaf6764 Wait for the first enterprise tab to be loaded 2020-01-16 15:10:25 +11:00
Maikel Linke
42aa15767e DRY navigating to Tag Rules section 2020-01-16 15:10:25 +11:00
Maikel
0da6275d41 Merge pull request #4675 from Matt-Yorkley/rails-4-prep-3 
Rails 4 prep continued
 2020-01-16 15:08:11 +11:00
Maikel
52d2d1d23c Merge pull request #4668 from Matt-Yorkley/rails-4-prep-2 
Rails 4 prep: admin dashboard route
 2020-01-16 14:16:32 +11:00
Maikel
4dfc020eaa Merge pull request #4666 from openfoodfoundation/transifex 
Transifex
 2020-01-16 12:10:12 +11:00
Maikel
8ef52f97e5 Merge pull request #4665 from openfoodfoundation/dependabot/bundler/selenium-webdriver-3.142.7 
Bump selenium-webdriver from 3.142.6 to 3.142.7
 2020-01-16 12:09:29 +11:00
Maikel
68a7f547b1 Merge pull request #4664 from openfoodfoundation/dependabot/bundler/test-unit-3.3.5 
Bump test-unit from 3.3.4 to 3.3.5
 2020-01-16 12:08:51 +11:00
Maikel
7a0f2d47a3 Merge pull request #4660 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.4 
Bump activerecord-import from 1.0.3 to 1.0.4
 2020-01-16 12:06:15 +11:00
Luis Ramos
4affd01b7b Merge pull request #4627 from luisramos0/mini_racer 
Update libv8 and keep it only in Gemfile.lock as a dependency of mini_racer
 2020-01-15 22:25:25 +00:00
Luis Ramos
0432c73f19 Merge pull request #4510 from luisramos0/backend_ctrl_resource 
Bring spree_backend resource controller to OFN
 2020-01-15 22:22:24 +00:00
dependabot-preview[bot]
6163661610 Bump oj from 3.10.0 to 3.10.1 
Bumps [oj](https://github.com/ohler55/oj) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.0...v3.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-15 19:15:31 +00:00
Matt-Yorkley
103902c006 Replace deprecated arguments in #find_by 
Failure/Error: enterprise = Enterprise.find_by(name: enterprise_name, select: 'id, is_primary_producer')

       ActiveRecord::StatementInvalid:
         PG::UndefinedColumn: ERROR:  column enterprises.select does not exist
         LINE 1: ...HERE "enterprises"."name" = 'User Enterprise' AND "enterpris...
         : SELECT  "enterprises".* FROM "enterprises"  WHERE "enterprises"."name" = 'User Enterprise' AND "enterprises"."select" = 'id, is_primary_producer' LIMIT 1
       # ./app/models/product_import/spreadsheet_data.rb:48:in `block in create_enterprises_index'
       # ./app/models/product_import/spreadsheet_data.rb:43:in `each'
 2020-01-15 16:39:33 +01:00
Matt-Yorkley
d2933e35f1 Explicitly require Spree::Admin::BaseHelper 
NameError: undefined method `preference_field_tag' for module `Spree::Admin::BaseHelper'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method_chain'
/home/runner/openfoodnetwork/app/helpers/spree/admin/base_helper_decorator.rb:11:in `<module:BaseHelper>'
/home/runner/openfoodnetwork/app/helpers/spree/admin/base_helper_decorator.rb:3:in `<module:Admin>'
 2020-01-15 13:07:50 +01:00
Matt-Yorkley
0b5e341ae7 Explicitly require Spree::Admin::NavigationHelper 
NameError: undefined method `klass_for' for module `Spree::Admin::NavigationHelper'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method_chain'
/home/runner/openfoodnetwork/app/helpers/spree/admin/navigation_helper_decorator.rb:18:in `<module:NavigationHelper>'
 2020-01-15 13:07:46 +01:00
Matt-Yorkley
7d36c3b5aa Make some private methods public in orders_and_fulfillments_report.rb 
Fixes errors for "call to private method ..."
 2020-01-15 13:05:36 +01:00