raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-09 23:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,845 Commits 18 Branches 453 Tags
57504f42d89f092a46b52346bd63e6a7104329ac
Commit Graph

21845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
87b14f0237 Avoid using #allow_any_instance_of 2021-01-08 17:47:09 +00:00
Matt-Yorkley
3b1ad29d20 Fix view rendering in Api::BaseController 2021-01-08 17:47:09 +00:00
Matt-Yorkley
eec9f27353 Move controller concern to correct directory 
This is a controller concern, it should live in app/controllers/concerns/
 2021-01-08 17:47:09 +00:00
Matt-Yorkley
d90ed56603 Add missing test for Api::OrderCyclesController responses 2021-01-08 17:47:09 +00:00
Matt-Yorkley
0dd57fc3de Render an empty JSON object instead of a blank string 2021-01-08 17:47:09 +00:00
Matt-Yorkley
04e4893723 Update route declarations in caching spec 2021-01-08 17:47:09 +00:00
Matt-Yorkley
4ba3c81f90 Update route declaration in karma test 2021-01-08 17:47:09 +00:00
Matt-Yorkley
261ed751cb Remove explicit content_type declarations in Api::OrderCyclesController 
This should be handled in `Api::BaseController`
 2021-01-08 17:47:09 +00:00
Matt-Yorkley
d0800b5e32 Specify json format for API routes that return json in OrderCycleResource 2021-01-08 17:47:09 +00:00
Pau Pérez Fabregat
95ab6c7d83 Merge pull request #6627 from Matt-Yorkley/dead-code-product-available 
Delete dead code Spree::Product#available?
 2021-01-08 17:35:21 +01:00
Pau Perez
b08a918ba5 Do not check for spaces inside the braces of hash 
This shuts the annoying lint error

```
Hash attribute should start with one space after the opening brace
Hash attribute should end with one space before the closing brace
```

and it aligns with our existing style. See
https://github.com/openfoodfoundation/openfoodnetwork/pull/6629 as an
example.
 2021-01-08 17:22:37 +01:00
Pau Perez
03bb9899fa Copy Hound's default Haml lint config 2021-01-08 17:22:36 +01:00
dependabot[bot]
96cf1c0514 Bump ddtrace from 0.43.0 to 0.44.0 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.43.0 to 0.44.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.43.0...v0.44.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-08 16:20:47 +00:00
Pau Pérez Fabregat
8ca51c8b72 Merge pull request #6626 from Matt-Yorkley/flaky-oc-simple-spec 
[Flaky Spec] Improve simple OC spec
 2021-01-08 17:18:43 +01:00
Matt-Yorkley
0949e72c88 Merge pull request #6597 from Matt-Yorkley/cancancan 
Switch from cancan to cancancan
 2021-01-08 17:15:08 +01:00
Matt-Yorkley
139773bc22 Add inverse_of to associations between shipping methods and rates 
See 20d913c21c
 2021-01-08 15:42:58 +00:00
Matt-Yorkley
f07c2dcd84 Add inverse_of for associations involved in cart processing 
7bac3e7b2c

and

61bd5446e1
 2021-01-08 15:42:58 +00:00
Pau Perez
6e689c4607 Update all locales with the latest Transifex translations v3.5.0 2021-01-08 16:18:31 +01:00
Pau Pérez Fabregat
9cf71c703d Merge pull request #6615 from Matt-Yorkley/money 
Money!
 2021-01-08 13:24:14 +01:00
Matt-Yorkley
c281c67d0e Switch from cancan to cancancan 
Development of cancan stopped in 2013. cancancan is the active fork of the defunct original, and has been updated many times to keep up with changes in newer Rails and Ruby versions.
 2021-01-08 12:02:18 +00:00
Pau Pérez Fabregat
b51d8c573a Merge pull request #6614 from Matt-Yorkley/api-errors 
API Bugnag errors
 2021-01-08 12:59:11 +01:00
Pau Pérez Fabregat
47774b3b2e Merge pull request #6628 from openfoodfoundation/dependabot/bundler/rubocop-1.8.0 
Bump rubocop from 1.7.0 to 1.8.0
 2021-01-08 12:57:14 +01:00
Pau Pérez Fabregat
3927f56ed4 Merge pull request #6444 from openfoodfoundation/dependabot/bundler/kaminari-1.2.1 
[Security] Bump kaminari from 0.17.0 to 1.2.1
 2021-01-08 12:47:59 +01:00
Pau Pérez Fabregat
bd83443595 Merge pull request #6611 from jibees/6196-fix-text-wrapping-on-oc 
6196 fix text wrapping on oc
 2021-01-08 11:48:41 +01:00
Pau Pérez Fabregat
27e83392bf Merge pull request #6536 from coopdevs/enable-new-customer-balance-to-core-team 
Enable new customer balance for the beta testers
 2021-01-08 11:24:23 +01:00
Jean-Baptiste Bellet
fc71808517 use flex property to manage responsive 
and remove unsued properties
 2021-01-08 11:24:16 +01:00
Jean-Baptiste Bellet
5869eb1841 add new div container 
to use flexbox properties for its two child divs
named: select-and-closing-container
 2021-01-08 11:23:23 +01:00
dependabot[bot]
11ce9b943f Bump rubocop from 1.7.0 to 1.8.0 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v1.7.0...v1.8.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-08 05:39:09 +00:00
Andy Brett
72a65426a0 allow '&' and spaces 2021-01-07 20:50:43 -08:00
Andy Brett
d78e8acee7 Merge pull request #6619 from luisramos0/remove_oj 
Remove unused dependency
 2021-01-07 12:43:09 -08:00
Andy Brett
3073a9b588 Merge pull request #6618 from luisramos0/byebug 
Upgrade pry
 2021-01-07 12:41:43 -08:00
Andy Brett
0bb92e04b5 Merge pull request #6621 from openfoodfoundation/dependabot/bundler/bugsnag-6.19.0 
Bump bugsnag from 6.18.0 to 6.19.0
 2021-01-07 12:35:51 -08:00
Matt-Yorkley
52b43d8c23 Delete dead code 
This method isn't called from anywhere
 2021-01-07 16:03:04 +00:00
Pau Pérez Fabregat
ca84e3eafb Merge pull request #6610 from openfoodfoundation/dependabot/bundler/stripe-5.29.0 
Bump stripe from 5.28.0 to 5.29.0
 2021-01-07 16:58:02 +01:00
Matt-Yorkley
d27900d5fb Merge pull request #6525 from openfoodfoundation/transifex 
Transifex
 2021-01-07 16:54:22 +01:00
Pau Pérez Fabregat
7f3c4f2433 Merge pull request #6551 from coopdevs/track-request-queuing 
Track request queuing in Datadog
 2021-01-07 16:34:42 +01:00
Matt-Yorkley
0c9df590d3 Add some improvements to help ensure UI elements are actually loaded by Angular before they are clicked on by Capybara 2021-01-07 14:50:09 +00:00
dependabot[bot]
0fdf398dd0 Bump bugsnag from 6.18.0 to 6.19.0 
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.18.0 to 6.19.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.18.0...v6.19.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-07 05:42:58 +00:00
Maikel Linke
18b1504935 Emphasize disabled Add button when out of stock 
Using the same grey as was used in the bulk modal already. This makes it
more consistent and hopefully more clear.
 2021-01-07 10:32:10 +11:00
Luis Ramos
ea29c62c5e Remove unused dependency 2021-01-06 22:50:55 +00:00
Luis Ramos
18b84fc850 Upgrade pry 2021-01-06 22:41:20 +00:00
Matt-Yorkley
a8d07a7e80 Merge pull request #6602 from openfoodfoundation/dependabot/bundler/awesome_nested_set-3.3.1 
Bump awesome_nested_set from 3.2.1 to 3.3.1
 2021-01-06 21:43:12 +01:00
Matt-Yorkley
cca16c6e1f Fix stock issue and update specs (now passing) 
See: dcd5944a29
 2021-01-06 20:13:38 +00:00
Matt-Yorkley
c0c7c4f440 Import failing specs for stock items 
See: dcd5944a29
 2021-01-06 20:12:52 +00:00
Matt-Yorkley
cc88611b15 Update Spree::Money to use Monetize#parse instead of Money#parse 
This method was removed from the money gem without replacement. It's now provided by the monetize gem.
 2021-01-06 19:20:19 +00:00
Matt-Yorkley
3387bf5821 Switch from direct dependency on money gem to monetize gem 
This change is actually made around Spree 2.0, but we missed it. The `monetize` gem also installs the `money` gem.
 2021-01-06 19:17:00 +00:00
Matt-Yorkley
45e4d86631 Merge money_decorator.rb with money.rb 
The #rounded method was left out, as it appears to be dead code.
 2021-01-06 19:17:00 +00:00
dependabot-preview[bot]
47f59a5d0a [Security] Bump kaminari from 0.17.0 to 1.2.1 
Bumps [kaminari](https://github.com/kaminari/kaminari) from 0.17.0 to 1.2.1. **This update includes security fixes.**
- [Release notes](https://github.com/kaminari/kaminari/releases)
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kaminari/kaminari/compare/v0.17.0...v1.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-01-06 19:09:53 +00:00
Matt-Yorkley
0fbf3d6cd9 Merge pull request #6555 from filipefurtad0/tax_rates_spec 
Extends spec coverage of Tax Rates settings - CRUD operations
 2021-01-06 19:16:14 +01:00
Matt-Yorkley
019f4dfa24 Merge pull request #6605 from PauloVilarinho/refactor-pagination-data 
Refactor pagination data
 2021-01-06 19:06:23 +01:00