mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-24 08:52:14 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,496 Commits 60 Branches 82 Tags
b3ecdb0ae533e025d6542e47790b8d0daa0fcffd
Commit Graph

473 Commits

Author SHA1 Message Date
Brenda Wallace
c16ee81c88 Add rubocop-rspec 2018-09-13 22:51:42 +12:00
Brenda Wallace
f52acd5282 Adding puma to gem bundle 2018-09-13 22:44:32 +12:00
Brenda Wallace
ae48bd0564 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-09-11 16:08:15 +12:00
Brenda Wallace
550860178e Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-09-11 16:07:30 +12:00
dependabot[bot]
4ec327f705 [Security] Bump rubyzip from 1.2.1 to 1.2.2 
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.1 to 1.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.1...v1.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-09 08:35:44 +00:00
Brenda Wallace
338e705db7 Upgrade elastic search gems 2018-09-09 09:44:27 +12:00
dependabot[bot]
dfc53747d9 Bump unicorn from 5.4.0 to 5.4.1 
Bumps [unicorn](https://bogomips.org/unicorn/) from 5.4.0 to 5.4.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-07 11:45:52 +12:00
dependabot[bot]
b5c55f42b8 Bump selenium-webdriver from 3.13.0 to 3.14.0 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-3.13.0...selenium-3.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-07 09:07:48 +00:00
dependabot[bot]
53ddb4ef94 Bump rspec-rails from 3.7.2 to 3.8.0 
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.7.2 to 3.8.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.7.2...v3.8.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-07 21:05:39 +12:00
dependabot[bot]
02f4c7f3ac Bump active_utils from 3.3.11 to 3.3.12 
Bumps [active_utils](https://github.com/shopify/active_utils) from 3.3.11 to 3.3.12.
- [Release notes](https://github.com/shopify/active_utils/releases)
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md)
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.11...v3.3.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-06 08:18:44 +00:00
dependabot[bot]
329f77db78 Bump factory_bot_rails from 4.8.2 to 4.10.0 
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 4.8.2 to 4.10.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v4.8.2...v4.10.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-06 20:15:13 +12:00
dependabot[bot]
5dd22d8d1c Bump capybara-screenshot from 1.0.19 to 1.0.21 
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot) from 1.0.19 to 1.0.21.
- [Release notes](https://github.com/mattheworiordan/capybara-screenshot/releases)
- [Changelog](https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattheworiordan/capybara-screenshot/compare/v1.0.19...v1.0.21)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-16 09:25:22 +00:00
dependabot[bot]
dbbd7fdeb4 Bump uglifier from 4.1.14 to 4.1.15 
Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.14 to 4.1.15.
- [Release notes](https://github.com/lautis/uglifier/releases)
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lautis/uglifier/compare/v4.1.14...v4.1.15)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-16 21:23:32 +12:00
dependabot[bot]
40600215bc Bump geocoder from 1.4.7 to 1.4.9 
Bumps [geocoder](https://github.com/alexreisner/geocoder) from 1.4.7 to 1.4.9.
- [Release notes](https://github.com/alexreisner/geocoder/releases)
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.4.7...v1.4.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-12 08:25:38 +00:00
dependabot[bot]
711fb28f49 Bump faker from 1.8.7 to 1.9.1 
Bumps [faker](https://github.com/stympy/faker) from 1.8.7 to 1.9.1.
- [Release notes](https://github.com/stympy/faker/releases)
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-12 07:25:39 +00:00
dependabot[bot]
1b6bbfcfac Bump font-awesome-sass from 5.0.9 to 5.0.13 
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.0.9 to 5.0.13.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.0.9...5.0.13)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-03 22:13:14 +00:00
dependabot[bot]
14dd8bbc8b Bump uglifier from 4.1.13 to 4.1.14 
Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.13 to 4.1.14.
- [Release notes](https://github.com/lautis/uglifier/releases)
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lautis/uglifier/compare/v4.1.13...v4.1.14)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-03 21:03:20 +00:00
dependabot[bot]
1211be2fef Bump chartkick from 2.3.4 to 2.3.5 
Bumps [chartkick](https://github.com/ankane/chartkick) from 2.3.4 to 2.3.5.
- [Release notes](https://github.com/ankane/chartkick/releases)
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v2.3.4...v2.3.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-03 10:46:22 +00:00
Daniel O'Connor
5d88b65284 Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11 2018-07-02 15:25:39 +09:30
Daniel O'Connor
31d97f4c00 Merge pull request #1653 from Growstuff/dependabot/bundler/newrelic_rpm-5.2.0.345 
Bump newrelic_rpm from 5.0.0.342 to 5.2.0.345
 2018-07-02 15:24:22 +09:30
Daniel O'Connor
ec9f57e6b8 Merge pull request #1649 from Growstuff/dependabot/bundler/selenium-webdriver-3.13.0 
Bump selenium-webdriver from 3.11.0 to 3.13.0
 2018-07-02 15:23:53 +09:30
Daniel O'Connor
dd0e9f74e6 Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11 2018-07-02 13:20:41 +09:30
Daniel O'Connor
9d389726f5 Merge branch 'dev' into dependabot/bundler/newrelic_rpm-5.2.0.345 2018-07-02 12:44:26 +09:30
Daniel O'Connor
4fd0096c85 Merge pull request #1651 from Growstuff/dependabot/bundler/rack-protection-2.0.3 
Bump rack-protection from 2.0.1 to 2.0.3
 2018-07-02 12:44:02 +09:30
dependabot[bot]
d2c81d6b29 Bump newrelic_rpm from 5.0.0.342 to 5.2.0.345 
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.0.0.342 to 5.2.0.345.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-01 11:55:29 +00:00
dependabot[bot]
5ad44c10af Bump uglifier from 4.1.10 to 4.1.13 
Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.10 to 4.1.13.
- [Release notes](https://github.com/lautis/uglifier/releases)
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lautis/uglifier/compare/v4.1.10...v4.1.13)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-01 11:54:50 +00:00
dependabot[bot]
008537a324 Bump rack-protection from 2.0.1 to 2.0.3 
Bumps [rack-protection](http://www.sinatrarb.com/protection/) from 2.0.1 to 2.0.3.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-01 11:52:31 +00:00
dependabot[bot]
116a9a8bab Bump comfortable_mexican_sofa from 1.12.10 to 1.12.11 
Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa) from 1.12.10 to 1.12.11.
- [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases)
- [Commits](https://github.com/comfy/comfortable-mexican-sofa/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-01 11:51:52 +00:00
dependabot[bot]
dc7cbadfc0 Bump selenium-webdriver from 3.11.0 to 3.13.0 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.11.0 to 3.13.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-3.11.0...selenium-3.13.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-01 11:50:30 +00:00
dependabot[bot]
e66924151a [Security] Bump sprockets from 3.7.1 to 3.7.2 
Bumps [sprockets](http://getsprockets.org/) from 3.7.1 to 3.7.2. **This update includes security fixes.**

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-06-25 03:31:45 +00:00
Brenda Wallace
4d937a1f91 Restoring Comfy mexican sofa 2018-06-04 16:29:38 +12:00
Brenda Wallace
9290e6d27a Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-05-02 20:08:42 +12:00
deppbot
681b5bbd8c Bundle Update on 2018-04-29 2018-04-29 13:09:27 +08:00
Brenda Wallace
f8a404a88b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/crop.rb
	app/models/forum.rb
	app/models/photo.rb
	app/models/planting.rb
	app/models/seed.rb
	db/schema.rb
	spec/models/garden_spec.rb
	spec/models/planting_spec.rb
 2018-04-28 21:25:06 +12:00
Brenda Wallace
aa9841dc7d Pinned elastic search to 5.0.0. or later 2018-04-28 18:34:26 +12:00
deppbot
5b5eacb738 Bundle Update on 2018-04-26 2018-04-26 09:23:58 +08:00
Brenda Wallace
86781f3491 Bundle upgrade 2018-04-21 21:14:18 +12:00
Brenda Wallace
11fd95e2b8 Upgrading rubocop and haml_lint to match hound 2018-04-02 15:45:06 +12:00
Brenda Wallace
fa32537c3b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	.rubocop_todo.yml
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/members.js.erb
	app/assets/stylesheets/predictions.sass
	app/controllers/crops_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/plantings_controller.rb
	app/models/account.rb
	app/models/account_type.rb
	app/models/member.rb
	app/models/order.rb
	app/models/order_item.rb
	app/models/product.rb
	app/views/gardens/show.html.haml
	app/views/layouts/application.html.haml
	config/initializers/assets.rb
	config/routes.rb
	db/schema.rb
	package-lock.json
	spec/controllers/account_types_controller_spec.rb
	spec/controllers/admin/orders_controller_spec.rb
	spec/controllers/comments_controller_spec.rb
	spec/controllers/gardens_controller_spec.rb
	spec/controllers/harvests_controller_spec.rb
	spec/controllers/member_controller_spec.rb
	spec/controllers/order_items_controller_spec.rb
	spec/controllers/orders_controller_spec.rb
	spec/controllers/photo_associations_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/controllers/plantings_controller_spec.rb
	spec/controllers/seeds_controller_spec.rb
	spec/controllers/shop_controller_spec.rb
	spec/features/crops/crop_detail_page_spec.rb
	spec/models/member_spec.rb
	spec/models/post_spec.rb
	spec/views/crops/_planting_advice.html.haml_spec.rb
	spec/views/home/_crops.html.haml_spec.rb
	spec/views/orders/show.html.haml_spec.rb
	spec/views/posts/show.html.haml_spec.rb
	spec/views/shop/index_spec.rb
 2018-04-02 10:59:13 +12:00
Brenda Wallace
2d309b7645 Removing jasmine, we have no jasmine specs 2018-04-02 09:58:02 +12:00
Brenda Wallace
31d2aa052a More bundle updates 2018-04-01 14:16:50 +12:00
deppbot
61468b3587 Bundle Update on 2018-03-22 2018-03-22 13:13:48 +08:00
deppbot
c80685bf0d Security Update on 2018-03-20 (#1597) 
* Security Update on 2018-03-20

* Ordered gems, to please rubocop
 2018-03-22 14:14:19 +13:00
deppbot
64a8cfb59f Security Update on 2018-03-16 (#1593) 2018-03-16 14:54:36 +13:00
Brenda Wallace
aab91e2fa9 Removed active merchant 2018-02-09 10:53:05 +13:00
deppbot
ed2fcc2ada Bundle Update on 2018-02-07 2018-02-07 08:40:54 +13:00
deppbot
24931381af Bundle Update on 2018-02-03 2018-02-04 08:25:59 +13:00
deppbot
742c7e30a9 Bundle Update on 2018-01-31 2018-01-31 13:12:08 +13:00
deppbot
093a948922 Bundle Update on 2018-01-28 2018-01-29 09:54:30 +13:00
deppbot
be1553410f Bundle Update on 2018-01-24 2018-01-29 09:54:20 +13:00