raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,987 Commits 20 Branches 451 Tags
9abe41f6cb61ba1a16d1f7d014e6e66646df367f
Commit Graph

445 Commits

Author SHA1 Message Date
Luis Ramos
88896b7730 Merge branch 'master' into 3-0-stable-jun-2 2020-06-08 19:17:11 +01:00
Luis Ramos
cce26cb453 Merge branch '3-0-stable' into 3-0-stable-jun-2 2020-06-03 19:51:43 +01:00
Luis Ramos
0b76a25941 Add spree_core dependencies to OFN so we can upgrade them 
This will enable us to upgrade these dependencies independently
 2020-06-03 14:25:27 +01:00
Luis Ramos
c9a7a6e897 Merge branch 'master' into 3-0-stable-jun-2 2020-06-02 16:00:45 +01:00
dependabot-preview[bot]
f773e57dee Bump i18n-js from 3.6.0 to 3.7.0 
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.6.0...v3.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-05-29 19:20:40 +00:00
Luis Ramos
50e4896e32 Fix error in dependency requirement specification 
~> 11.0 allows upgrades to 11.1, we want to lock it to 11.0.x so we need ~> 11.0.0

Same logic for pry-byebug
 2020-05-25 18:15:47 +01:00
Luis Ramos
f34f693620 Merge branch 'master' into 3-0-stable-may-22 2020-05-22 22:54:19 +01:00
Luis Ramos
574e4a02c0 Force pry to 0.12 so that it works well with pry-byebug 3.7 2020-05-21 13:10:59 +01:00
Luis Ramos
01eda90a00 Upgrade bundler, byebug and pry-byebug 2020-05-21 12:59:57 +01:00
Pau Pérez Fabregat
6851921e9d Merge pull request #5443 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.14 
Bump mini_racer from 0.2.11 to 0.2.14
 2020-05-21 13:32:30 +02:00
Luis Ramos
2e9f911958 Add actionpack-action_caching to support action caching 2020-05-19 12:06:24 +01:00
dependabot-preview[bot]
f4afc8ffcd Bump mini_racer from 0.2.11 to 0.2.14 
Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.2.11 to 0.2.14.
- [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.11...v0.2.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-05-15 19:20:08 +00:00
Luis Ramos
367de87c61 Upgrade jquery-ui-rails to v4.2 2020-05-15 08:58:40 +01:00
Maikel
d566051e7d Merge pull request #5432 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.11 
Bump mini_racer from 0.2.10 to 0.2.11
 2020-05-15 11:20:46 +10:00
Maikel
6c409d6c70 Merge pull request #5380 from ckhung5/5201-fix-missing-jquery-ui 
Update jquery-ui-rails version to 4.1.1
 2020-05-15 11:11:36 +10:00
dependabot-preview[bot]
99ab7688b6 Bump mini_racer from 0.2.10 to 0.2.11 
Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.2.10 to 0.2.11.
- [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.10...v0.2.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-05-14 20:36:44 +00:00
Luis Ramos
19da0ba969 Merge branch 'master' into 3-0-stable-may13 2020-05-13 19:50:32 +01:00
Kok Hung Cheah
19d5bcb150 Upgrade jquery-ui-rails to 4.1.2 instead of 4.1.1 2020-05-08 09:54:10 +10:00
Kok Hung Cheah
edcdae6b58 Update jquery-ui-rails version to 4.1.1 2020-05-07 10:48:07 +10:00
François Turbelin
d9d218f661 Add DFC Provider engine 2020-05-06 22:04:56 +02:00
Luis Ramos
839b373b5c Merge branch 'master' into 3-0-stable-Apr28 2020-04-28 13:40:19 +01:00
dependabot-preview[bot]
240d4a7802 Bump mini_racer from 0.2.9 to 0.2.10 
Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.2.9 to 0.2.10.
- [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.9...v0.2.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-22 19:41:50 +00:00
Luis Ramos
3dff11e405 Merge pull request #5182 from luisramos0/nokogiri 
Bump Nokogiri
 2020-04-22 20:40:04 +01:00
Luis Ramos
23f4faf192 Merge pull request #4841 from luisramos0/kill_rabl 
Hide broken product taxons field, remove last rabl template and rabl itself
 2020-04-21 18:49:12 +01:00
Luis Ramos
4aad80c134 Update message for capybara with new upgrade blocker 2020-04-09 13:39:40 +01:00
Luis Ramos
71ffa6b178 Upgrade nokogiri as much as possible (it's not an explicit dependency of OFN and we dont need to control the version now, so I remove it from Gemfile) 2020-04-09 13:39:40 +01:00
Luis Ramos
e3de71668a Depend on a spree version in which spree_core doesnt depend on deface AND remove deface from list of dependencies 2020-04-09 13:39:40 +01:00
Matt-Yorkley
ce45e7cf71 Merge pull request #5162 from Matt-Yorkley/unicorn-worker-killer 
Add optional unicorn-worker-killer configs
 2020-04-06 13:25:22 +02:00
Matt-Yorkley
276dcf4a3b Add optional unicorn-worker-killer configs 2020-04-06 10:39:50 +02:00
Luis Ramos
59bb956677 Merge pull request #5010 from Matt-Yorkley/remove_simple_form 
Remove simple_form
 2020-04-04 11:53:06 +01:00
Luis Ramos
4f08ed1801 Remove commented turbo-sprockets-rails3 from Gemfile, thsi gem is not needed in rails 4 2020-04-04 11:39:20 +01:00
Luis Ramos
384ca310a3 Merge branch 'master' into 3-0-stable-apr3 2020-04-03 18:26:26 +01:00
Pau Pérez Fabregat
1c2815d2b7 Merge pull request #5044 from luisramos0/add_spring 
[Spree 2.1] Re-add spring and newrelic_rpm
 2020-03-26 11:23:19 +01:00
Luis Ramos
523faa670d Remove FoundationRailsHelper, this is dead code now 2020-03-25 17:31:56 +00:00
Luis Ramos
570fb4bfb4 Upgrade factory_bot_rails 2020-03-24 19:18:13 +00:00
Luis Ramos
5453fed716 Upgrade rails from 4.0.0 to 4.0.13 2020-03-24 19:18:13 +00:00
Luis Ramos
b8ed28b38c Remove deface, it's already included in spree_core, it's not a direct dependency of OFN anymore 2020-03-24 19:18:13 +00:00
Luis Ramos
658a024272 Re-add spring and newrelix_rpm 2020-03-22 10:41:59 +00:00
Luis Ramos
1c628fac58 Merge branch 'master' into 3-0-stable-mar20 2020-03-20 11:28:06 +00:00
Luis Ramos
3b2c10526d Merge pull request #4838 from openfoodfoundation/dependabot/bundler/jquery-rails-3.1.5 
[Security] Bump jquery-rails from 3.0.4 to 3.1.5
 2020-03-20 09:49:22 +00:00
Matt-Yorkley
45b5e838b7 Remove simple_form 
It looks like we don't use this at all. Discovered during the Spree 2.1 upgrade.
 2020-03-17 17:03:48 +01:00
Luis Ramos
da837ff100 Remove rabl dependency 🎉 2020-03-17 15:51:50 +00:00
Luis Ramos
bae9df8214 Merge pull request #4787 from luisramos0/catalog_domain 
Add new domain/engine Catalog
 2020-03-16 18:47:55 +00:00
Luis Ramos
32a4355f09 Merge branch 'master' into 3-0-stable-mar6 2020-03-12 16:54:09 +00:00
dependabot-preview[bot]
8eb60388fd Bump rack-mini-profiler from 1.1.6 to 2.0.0 
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 1.1.6 to 2.0.0.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.1.6...v2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-11 19:19:24 +00:00
Matt-Yorkley
7dbe0bd6b9 Use new branch of ofn-qz gem 2020-02-28 15:27:11 +01:00
Matt-Yorkley
1f59bc8bef Use new branch of the paypal gem 
This uses the `2-1-0-stable` branch of the paypal gem. It's the 2-1-stable branch plus a couple of old OFN modifications (from 2-0-stable), plus a minor modification to the gemspec to allow it to be used with spree_core `2.1.0`
 2020-02-28 12:18:53 +01:00
Luis Ramos
bf47d34434 Merge branch 'master' into 3-0-merge-master 2020-02-28 09:52:01 +00:00
Luis Ramos
33d77d57f4 Merge pull request #4776 from luisramos0/remove_assets_group 
Remove the assets group from the gemfile (taken from spree upgrade branch)
 2020-02-24 20:12:01 +00:00
dependabot-preview[bot]
51dd55c5b9 [Security] Bump jquery-rails from 3.0.4 to 3.1.5 
Bumps [jquery-rails](https://github.com/rails/jquery-rails) from 3.0.4 to 3.1.5. **This update includes a security fix.**
- [Release notes](https://github.com/rails/jquery-rails/releases)
- [Changelog](https://github.com/rails/jquery-rails/blob/v3.1.5/CHANGELOG.md)
- [Commits](https://github.com/rails/jquery-rails/compare/v3.0.4...v3.1.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 19:14:38 +00:00