Commit Graph

271 Commits

Author SHA1 Message Date
luisramos0
6fc3562a73 Merge branch 'master' into 2-0-stable-dec-18th 2018-12-18 23:32:45 +00:00
Pau Pérez Fabregat
34a42cc592 Merge pull request #3181 from luisramos0/roadie-rails-upgrade
Bump roadie-rails from 1.0.3 to 1.1.1
2018-12-14 15:26:25 +01:00
Maikel
eb016c0471 Merge pull request #3145 from openfoodfoundation/dependabot/bundler/i18n-js-3.1.0
Bump i18n-js from 3.0.11 to 3.1.0
2018-12-13 10:58:22 +11:00
luisramos0
bbc61b4eda Bump roadie-rails to 1.1.1 2018-12-05 15:11:45 +00:00
luisramos0
3776b891ce Merge branch 'master' into 2-0-stable-dec-3rd 2018-12-03 15:30:16 +00:00
dependabot[bot]
7b95e3a8d7 Bump i18n-js from 3.0.11 to 3.1.0
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.0.11 to 3.1.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.0.11...v3.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-27 19:17:57 +00:00
Pau Perez
b365488653 Enable rack-mini-profiler in development
This will run it always in development mode.
2018-11-26 12:10:49 +01:00
Hugo Daniel
d060704e86 Change Spree step-6a commit reference in Gemfile 2018-11-15 15:40:44 +01:00
luisramos0
87cd73ddba Merge branch 'master' into 2-0-stable-oct 2018-10-15 17:09:26 +01:00
Pau Pérez Fabregat
fe149967e4 Merge pull request #2521 from luisramos0/cookies_in_engine
[OFN Domains] Breaking OFN into domains - POC cookies inside an engine
2018-10-15 10:03:30 +02:00
Maikel Linke
4cbc449a51 Remove unused parallel_tests gem
Reverts db47c01784
2018-10-09 16:54:08 +11:00
Pau Pérez Fabregat
b139f3839a Merge pull request #2806 from luisramos0/rep
Delete representative_view dependency, not used
2018-10-04 13:02:35 +02:00
luisramos0
daafe73d81 Delete representative_view dependency, not used 2018-10-02 15:11:13 +01:00
Pau Perez
16badcd1b5 Setup Simplecov to have code coverage analysis
This enables code coverage analysis when running specs in your dev
environment. Simply run them as usual and you'll see a line like the
following at the end of the output:

  Coverage report generated for RSpec to /home/pau/dev/openfoodnetwork/coverage

Simply browse to coverage/index.html and the results in a web UI.

This is a useful tool that helps you decide if the tests you added are
enough or not.
2018-09-27 15:57:02 +02:00
luisramos0
d170a4d489 New domain Web (rails engine) with the following features extracted from the main app:
- cookies banner
- cookies policy page
- cookies policy and privacy policy links in the footer
2018-09-17 16:05:32 +01:00
Maikel
f46c1e8414 Merge pull request #2424 from frank-west-iii/issue-2100-mini-racer
Replace therubyracer with mini_racer
2018-09-13 12:28:03 +10:00
Pau Pérez Fabregat
e474271698 Merge pull request #2637 from Vadlusk/remove_css_splitter
Remove duplicate css_splitter references, delete split css file.
2018-09-12 13:07:15 +02:00
Maikel Linke
d6c2a36451 Blacklist libv8 version that breaks mini_racer 2018-09-07 14:11:33 +10:00
Frank West
b9fe1ced16 Replace therubyracer with mini_racer
This is being replaced to increase the reliability and speed of asset
compilation.
2018-09-07 14:11:30 +10:00
luisramos0
89d51d75ae Merge branch 'master' into 2-0-stable-sept 2018-09-04 17:43:20 +01:00
Maikel
129e2c915e Merge pull request #2579 from openfoodfoundation/dependabot/bundler/angular-rails-templates-0.3.0
Bump angular-rails-templates from 0.2.0 to 0.3.0
2018-09-03 14:39:21 +10:00
VadLusk
f74a6e47d5 Remove css_splitter references, delete all_split2.css. #1361 #2633 2018-09-03 09:20:26 +10:00
Pau Pérez Fabregat
b4bfa3ff2d Merge pull request #2591 from mkllnk/remove-rack-livereload
Remove gem rack-livereload
2018-08-30 13:50:57 +02:00
Maikel
1c61539119 Merge pull request #2585 from greysteil/bump-ams
Bump active_model_serializer to 0.8.4, and pin it
2018-08-30 10:00:22 +10:00
Grey Baker
562a7936d9 Bump active_model_serializer to 0.8.4 2018-08-28 01:00:06 +01:00
Maikel Linke
58cbe492d4 Remove gem rack-livereload
I don't think that anybody is using it. I asked on Slack and people
didn't know what it was. I kept guard-livereload which is probably
offering the same, maybe even better.
2018-08-27 16:34:50 +10:00
dependabot[bot]
358bb3030a Bump stripe from 3.3.1 to 3.3.2
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v3.3.1...v3.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-23 19:16:15 +00:00
dependabot[bot]
2e4a8d6318 Bump angular-rails-templates from 0.2.0 to 0.3.0
Bumps [angular-rails-templates](https://github.com/pitr/angular-rails-templates) from 0.2.0 to 0.3.0.
- [Release notes](https://github.com/pitr/angular-rails-templates/releases)
- [Changelog](https://github.com/pitr/angular-rails-templates/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pitr/angular-rails-templates/compare/v0.2.0...v0.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-23 19:15:48 +00:00
dependabot[bot]
ade005bb2c Bump fuubar from 2.2.0 to 2.3.2
Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.2.0 to 2.3.2.
- [Release notes](https://github.com/thekompanee/fuubar/releases)
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.2.0...releases/v2.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-22 07:47:04 +00:00
Pau Perez
c4b23b62d0 Update Spree's fork revision in Gemfile 2018-07-30 18:11:02 +10:00
Pau Perez
43bf7293bf Merge branch 'master' into 2-0-stable
* master: (125 commits)
  Fix syntax error in GETTING_STARTED.md
  Fix syntax error in README.md
  Fix link syntax errors in REAME.md and GETTING_STARTED.md
  Style recently merged code
  Update gem i18n-js to pick up locale changes
  Fix embedded shopfront menu responsiveness
  Add communications links to README
  Fix script/setup by making it less clever
  Change import and reset logic to work with first page
  Move options to first page
  Fix wrong sort predicates in customer index
  Reset reverse when clicking another column to sort
  Move logic for toggling by column into SortOptions
  Generalize sorting through SortOptions service
  Remove unused sorting preferences in ColumnsCtrl
  Fix frontend sorting in "Bulk Order Management"
  Fix frontend sorting in "Customers" index
  Change sorting to be done in ascending order first
  Wrap rows in customer index with TBODY tag
  Update .rubocop_todo.yml
  ...
2018-07-27 10:21:47 +02:00
Maikel Linke
5f4115fbd9 Remove unused gem newrelic-rpm 2018-07-20 16:56:12 +10:00
Pau Perez
7707df354b Merge branch 'master' into 2-0-stable
* master: (206 commits)
  embedded groups layout changes
  embedded groups initial test
  Allow html requests for OrderCycleController#update
  Move applicator calls to OrderCycleForm
  Refactor OrderCycleForm to make logic clearer
  Extract schedule syncing logic into OrderCycleForm
  Add basic specs for OrderCyclesController#create
  Add basic OrderCycleForm to handle create/update logic
  Remove unnecessary respond_to blocks from OrderCyclesController
  Include admin users as managers on new enterprises
  Remove obsolete goWithoutHashFragments
  Simplify Navigation.go, not preserving hash fragments
  Only show change warning for open order cycles
  Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer
  Preload subscription counts for serialization in order cycle collection actions
  Request the subscription count for change warning each time, don't cache
  Ask user to confirm oc date change for open order cycles with subsciptions
  Fix ordering of Gemfile.lock
  Add rack-rewrite to handle redirects
  Renames product bulk edit action to index
  ...
2018-06-22 13:23:18 +02:00
Frank West
f7848b025f Add rack-rewrite to handle redirects
We are moving bulk edit to a different route and we want to be able to
handle redirects on this route. Handling this at the rack level before
the rails stack is the most performant way outside of rewrites on the
web server itself.
2018-06-19 17:51:23 +10:00
Matt-Yorkley
7a64ad1cc1 Fix roo-xls version in Gemfile 2018-05-26 19:34:20 +01:00
Matt-Yorkley
3a650dd8b3 Add roo-xls gem for Excel support 2018-05-26 19:34:19 +01:00
Maikel Linke
585bba0e23 Update activemerchant to v1.78 with new root cert
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/2265.

Most changes are in gateways we don't use, I believe. There has been a
change in Stripe, but we use another implementation, I guess.
2018-05-15 16:48:03 +10:00
Pau Perez
6f8317b007 Upgrade spree to point to 1c3dfc7fb
This will fetch latest changes applied in the fork. It also changes the
Github organization we fetch it from. From now on we'll work there and
not in Coopdevs org.
2018-05-14 13:05:51 +02:00
Daniel Dominguez
9d9a974295 Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated.
- Change FactoryGirl to FactoryBot everywhere on code.
2018-05-04 11:52:08 -03:00
Pau Perez
97e8adf7a7 Use OFN's Spree fork of 2.0.4 to get fixes
We encountered the bug that
3fd1535e75
fixes, which is needed to boot the app using Spree 2.0.4.

This stems from
https://github.com/openfoodfoundation/openfoodnetwork/issues/2236#issuecomment-384633612
2018-04-26 16:35:28 +02:00
Pau Perez
58f3b5a97e Upgrade Spree to 2.0.4 instead of 2.0.13
Although we don't know how big the fixes introduced between 2.0.4 and
2.0.13 are, jumping from roughly 1.3.99 to 2.0.13 seems too big of
a change to do in one go.

Unless more issues like this one come up that force us to upgrade to
a newer version I believe it's best to be conservative. You'll find an
in-depth explanation in
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Spree-2.0-upgrade#getting-to-version-204-

A previous effort was done to upgrade to v2.0.13 in
https://github.com/openfoodfoundation/openfoodnetwork/pull/2209
2018-04-18 08:56:03 +02:00
Pau Perez
ef3ef2d4f3 Upgrade Rails to 3.2.22.5 to get security fixes
This will fix reported vulnerabilities CVE-2015-7576, CVE-2016-2098
(reported as high severity), CVE-2016-0751 and CVE-2015-7577.
2018-04-17 20:56:51 +02:00
Pau Perez
06ef2a4c63 Remove commented out gem from Gemfile 2018-04-17 16:10:41 +02:00
Hugo Daniel
6f3663f1b9 update gemfile to spree 2.0.13 2018-04-17 16:10:40 +02:00
Pau Perez
6f879cd5d9 Remove unused gem Turn
It provides runners for MiniTest and we use RSpec.
2018-03-13 09:54:26 +01:00
Rob Harrington
9887819c16 Update ref for ofn-qz 2018-02-22 13:56:10 +11:00
Pau Pérez Fabregat
be07996656 Merge pull request #2070 from chancancode/skylight
Add Skylight instrumentation
2018-02-09 08:55:30 +01:00
Rob Harrington
7a308f1651 Updating letter_opener gem 2018-02-09 14:43:41 +11:00
Godfrey Chan
fbc5318a7b Add Skylight instrumentation
If you’re not already familiar with [Skylight](https://www.skylight.io),
it is a smart profiler for Rails apps. Skylight makes it easy to
pinpoint performance issues in Rails applications.

We work on a lot of open source projects ourselves, and in our
experience it can be pretty hard to get contributors to work on
application performance issues. Few contributors consider working
on performance problems, and the ones that might be interested may
not even know where to start.

By making performance information more accessible, we hope to
inspire potential contributors to tackle slow parts of your app,
and have a good way to see if their contributions helped.

Local deployments that are interested in this can request an API
token from https://www.skylight.io/oss and set it in
`config/application.yml` (if no token is set, it will log a message to
`log/skylight.log` but won't otherwise prevent the app from working
normally).
2018-02-07 11:37:30 -08:00
Pau Perez
0f0216fe79 Upgrade spree to get our latest patch 2017-12-21 10:24:29 +11:00