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

21845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luis Ramos
76a9271d9e Add spec to cover payments in the backoffice for an order in the payment state 2020-10-15 14:54:42 +01:00
Luis Ramos
0178d3f1e6 Add spec that takes a stripe payment in the BO 2020-10-15 14:54:42 +01:00
Luis Ramos
cfed6a7048 Split payments_spec so that we can add more stripe specific specs 2020-10-15 14:54:42 +01:00
Luis Ramos
c664181266 Update PULL_REQUEST_TEMPLATE.md 2020-10-15 14:39:20 +01:00
Luis Ramos
945ea476fc Merge pull request #6176 from openfoodfoundation/dependabot/bundler/timecop-0.9.2 
Bump timecop from 0.9.1 to 0.9.2
 2020-10-15 13:50:53 +01:00
Luis Ramos
9e4e72bec3 Merge pull request #6167 from jhsu802701/rubocop_spec_support_request 
Updated files in the spec/support/request directory for RuboCop compliance
 2020-10-15 13:48:12 +01:00
Daniel Santamaría
3fe7638dd6 Fix docker local environment setup 2020-10-15 12:28:07 +02:00
Pau Pérez Fabregat
981c17b6a5 Merge pull request #6169 from luisramos0/rubocop_refresh 
Refresh Rubocop exception files
 2020-10-15 12:06:41 +02:00
Pau Pérez Fabregat
55b6e7fa89 Merge pull request #6164 from openfoodfoundation/dependabot/bundler/webmock-3.9.2 
Bump webmock from 3.9.1 to 3.9.2
 2020-10-15 10:23:46 +02:00
Luis Ramos
d54ddacc05 Merge pull request #5887 from luisramos0/orders 
[Bye bye Spree] Bring models order, line_item and other related from spree_core
 2020-10-15 08:49:05 +01:00
dependabot-preview[bot]
b009c8675b Bump timecop from 0.9.1 to 0.9.2 
Bumps [timecop](https://github.com/travisjeffery/timecop) from 0.9.1 to 0.9.2.
- [Release notes](https://github.com/travisjeffery/timecop/releases)
- [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md)
- [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.1...v0.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-10-14 17:34:03 +00:00
Luis Ramos
2b6b2c1b65 Update rubocop manual according to latest state of the codebase 2020-10-14 10:11:56 +01:00
Luis Ramos
6ea021a561 Update rubocop_todo.yml 2020-10-14 09:59:08 +01:00
Jason Hsu
a8eaabc5da Used guard clause in spec/support/request/checkout_helper.rb instead of an if statement with two actions; reduces the number of RuboCop offenses from 108 to 107 2020-10-13 12:14:15 -05:00
Jason Hsu
0d051b7c7d Added '# frozen_string_literal: true' to spec/support/request/checkout_helper.rb; reduces number of RuboCop offenses from 109 to 108 2020-10-13 12:05:50 -05:00
Jason Hsu
c6d6b6f65a Removed empty trailing line in spec/support/request/stripe_helper.rb; reduces RuboCop offenses from 110 to 109 2020-10-13 12:01:11 -05:00
Luis Ramos
dbd41e9d31 Use ruby 2.4 as github actions do not support ruby 2.3. 2020-10-13 10:31:26 +01:00
Luis Ramos
87327dcf57 Add brakeman config 2020-10-13 10:31:13 +01:00
dependabot-preview[bot]
7c3da77ad6 Bump webmock from 3.9.1 to 3.9.2 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.1 to 3.9.2.
- [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.9.1...v3.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-10-13 09:07:36 +00:00
Pau Pérez Fabregat
f1e2040ce3 Merge pull request #6061 from arku/fix/sleep-removal 
Remove sleep calls from select2 helper
 2020-10-13 09:42:25 +02:00
Pau Pérez Fabregat
536f54d6a7 Merge pull request #6092 from jhsu802701/docker_scripts 
Added Docker scripts in the new Docker directory
 2020-10-13 09:36:12 +02:00
Arun Kumar Mohan
2ec35b6306 Remove unnecessary let declaration 2020-10-13 01:22:11 -05:00
Arun Kumar Mohan
e963ab4bd4 Replace FactoryBot.create with create 2020-10-13 01:21:47 -05:00
Matt-Yorkley
32999e6be4 Add polish translations with momentjs 2020-10-12 23:05:43 +01:00
Jason Hsu
03b33e99cf Merge branch 'master' into docker_scripts 2020-10-12 11:36:49 -05:00
Luis Ramos
9545c57969 Merge pull request #6049 from luisramos0/momentjs 
Use yarn and move Momentjs from gemfile to yarn
 2020-10-12 15:28:23 +01:00
Luis Ramos
9288250194 Merge pull request #5981 from luisramos0/spree_ability 
[Bye bye spree] Bring classes related to abilities to OFN
 2020-10-12 15:26:30 +01:00
Rajan Joshi
8b64fbe80e Reduce coverage threshold to 54 inorder to pass CI. 2020-10-11 19:18:24 +01:00
Rajan Joshi
fbadf25043 Add coverage threshold for simplecov. 2020-10-11 17:18:50 +01:00
Arun Kumar Mohan
14eee1c9e4 Improve product specs' performance 2020-10-11 01:10:11 -05:00
Arun Kumar Mohan
ff049d33e7 Improve variant stock specs' performance 2020-10-10 00:43:27 -05:00
Arun Kumar Mohan
b02e25af0e Improve shipment specs' performance 2020-10-09 23:28:32 -05:00
Arun Kumar Mohan
76293c335b Improve payment specs' performance 2020-10-09 23:05:14 -05:00
Arun Kumar Mohan
01d2c3cb9e Improve variant specs' performance 2020-10-09 22:11:34 -05:00
Arun Kumar Mohan
80c76606df Improve line items specs' performance 2020-10-09 22:11:34 -05:00
Arun Kumar Mohan
b07fbec8c6 Improve credit card specs' performance 2020-10-09 22:11:34 -05:00
Arun Kumar Mohan
c4205fce34 Improve enterprise specs' performance 2020-10-09 22:11:34 -05:00
Arun Kumar Mohan
a959f8e745 Improve inventory reset strategy specs' performance 2020-10-09 22:11:34 -05:00
Arun Kumar Mohan
437c39f795 Improve taxon specs' performance 2020-10-09 22:11:34 -05:00
Arun Kumar Mohan
27f1aeb803 Improve shipping method specs' performance 2020-10-09 22:11:31 -05:00
Jason Hsu
c53d4cf8ea Corrected typos in docker/seed 2020-10-08 23:24:54 -05:00
Jason Hsu
e5d97e37f1 Moved docker network prune -f command from docker/nukec to docker/nuke 2020-10-08 14:46:12 -05:00
Jason Hsu
71ad109f78 Changed docker/exec to docker/run; updated docker/README.md to reflect this 2020-10-08 14:43:30 -05:00
Jason Hsu
d9476ec87d Corrected the docker-compose commands in docker/cop, docker/seed, and docker/test-log 2020-10-08 14:38:49 -05:00
Jason Hsu
74980401b5 Synced to master; moved section about troubleshooting Docker in Windows to docker/README.md 2020-10-08 14:06:54 -05:00
Arun Kumar Mohan
1c4ef87654 Fix product import date filter spec 
The spec was failing because the date in the spec had a couple of
spaces after the month name (October  9, 2020) but in the filter,
the two spaces were converted to a single space (October 9, 2020)
and the select2 helper wasn't able to select the option.
 2020-10-08 13:29:23 -05:00
Luis Ramos
559af5076d Make the release notes intructions a bit more clear so new contributors make them short 2020-10-08 10:37:39 +01:00
Luis Ramos
6806035a45 Update all locales with the latest Transifex translations v3.2.10 2020-10-08 10:15:26 +01:00
Luis Ramos
b1dbf4fe0e Merge pull request #6147 from openfoodfoundation/transifex 
Transifex
 2020-10-08 10:13:00 +01:00
Luis Ramos
0829eaf0fb Merge pull request #6148 from openfoodfoundation/luisramos0-patch-1 
Add break line troubleshooting to docker guide
 2020-10-08 09:24:27 +01:00