mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-27 03:02:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,808 Commits 54 Branches 76 Tags
fc6ee9db36ed052d1adea3ec59d0af2dcbd2b6d6
Commit Graph

50 Commits

Author SHA1 Message Date
google-labs-jules[bot]
4d3c4ca10d Merge pull request #4154 from Growstuff/finish-expired-seeds-task 
Add maintenance task to finish expired seeds
 2025-08-28 00:16:16 +09:30
Daniel O'Connor
4f5c47ba58 Ruby 3.2: Rubocop - Layout/* (#3785) 
* Rubocop - Layout/*

* Regenerate
 2024-07-13 15:19:09 +09:30
Daniel O'Connor
d1f754a288 Rubocop 2022-11-08 00:23:38 +10:30
Daniel O'Connor
2db3d1bacc Various corrections 2022-11-08 00:21:23 +10:30
Daniel O'Connor
e2942f17c7 Rubocop corrections 2022-11-08 00:18:35 +10:30
Daniel O'Connor
b24b9f82e6 Rubocop - auto corrections 2022-11-06 16:34:36 +10:30
Awesome Code
4cbe6ca244 Auto corrected by following Lint Ruby RSpec/DescribedClass 2020-03-03 22:33:13 +00:00
Brenda Wallace
709ca5a04f Fix seeds ES query 2020-01-11 23:10:33 +13:00
Brenda Wallace
c6988e2189 Re-instate the plantings quick actions 2020-01-05 21:31:51 +13:00
codefactor-io
e8760f9c38 [CodeFactor] Apply fixes 2019-12-20 03:33:23 +00:00
Awesome Code
e7713ab24b Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace 2019-03-20 15:01:33 +13:00
Awesome Code
da997ae538 Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace 2019-03-20 15:01:33 +13:00
Awesome Code
689baa85a3 Auto corrected by following Lint Ruby RSpec/ExampleWording 2019-02-11 10:17:54 +13:00
Awesome Code
284bb81bbf Auto corrected by following Lint Ruby RSpecEmptyLine 2019-02-09 03:05:40 +00:00
Brenda Wallace
550860178e Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-09-11 16:07:30 +12:00
Awesome Code
90f4db4853 Auto corrected by following Ruby rspec layout 2018-09-10 22:20:12 +00:00
Brenda Wallace
a590b89302 Photos in spec needs to have same owner as item they link to 2018-06-04 15:29:59 +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
f9d4e1d6ae Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550) 
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Removed in-line style
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Moved finishable to a concern
* Seeds.finished_at
* rubocop fixes
* Made seeds sown migration the most recent
* Specs for home page
* Only show current seeds on home page
* Seeds appear for logged in or not
* Buttons to mark seeds finished
* JS for marking seeds finished
* Some actions only appear if seed or planting is active
* Fixed up display of home page
* Fixed typo in admin members#index
* Tidying up actions on all the things
* Harvest description in #index
* Truncate garden description if long
* Updated link label in view spec
* Show planted_from always, becuase it might be a parent seed
* find correct link in spec adding photos to garden
* fixed spec finding link to edit garden
* Better harvest description truncation
* Helping spec find the edit button
* specs for the home page
* Re-instate crops js, but in the correct file now
* Fixed link to garden in actions
* Tweaking mobile view
 2018-03-12 08:39:32 +13:00
Brenda Wallace
65b4c7dbc1 Revert "Auto corrected by following Style/StringLiterals" 
This reverts commit ab56a3c6b3.
 2018-02-09 07:58:47 +13:00
Awesome Code
ab56a3c6b3 Auto corrected by following Style/StringLiterals 2018-02-07 10:20:26 +13:00
Awesome Code
dea7ce241b Auto corrected by following RSpec/EmptyLineAfterFinalLet 2018-01-23 09:00:34 +13:00
Brenda Wallace
8e0b7d9ded Merge branch 'charts' into upgrade/rails-5 
Conflicts:
	app/assets/javascripts/crops.js.erb
	spec/controllers/comments_controller_spec.rb
	spec/controllers/harvests_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/controllers/plantings_controller_spec.rb
	spec/models/post_spec.rb
	spec/views/home/_crops.html.haml_spec.rb
 2018-01-11 08:34:20 +13:00
Awesome Code
e46f530dc3 Auto corrected by following RSpec/EmptyLineAfterFinalLet 2018-01-09 02:00:40 +00:00
Brenda Wallace
4800f405ea Two more fixes to tests for slug generation 2018-01-06 12:35:05 +13:00
Brenda Wallace
a6a7f789a3 Rubocop upgrade (and some style fixes) 2017-12-01 21:07:39 +13:00
Brenda Wallace
470aacd1c9 Fixed %w for an array of words 2017-11-06 09:11:27 +13:00
Logan Gingerich
10a8df47a9 Factorygirl to factorybot - fixes #1413 (#1425) 
* FactoryGirl Changed to FactoryBot

file fix

changes based on comments received

Bundle Update on 2017-10-29

style update to align hash literal

added package-lock

* indentation fixes with rubocop

* name added to contributors
 2017-11-01 15:03:31 +00:00
Brenda Wallace
6f58f266a6 Moving has_photos scope to PhotoCapable 
-
 2017-05-20 15:46:37 +12:00
Brenda Wallace
62e7c716dd Removed extra empty blank lines 2016-11-26 12:06:02 +13:00
Brenda Wallace
b17e4eed7d Block indentation fixups 2016-11-26 12:02:47 +13:00
Brenda Wallace
83392ddda1 Indentation clean ups 2016-11-26 10:51:54 +13:00
Brenda Wallace
2872a1c29d Wrapped all long lines. 
reduced rubocop's line length limit to 120
 2016-11-17 22:02:18 +13:00
Daniel O'Connor
4b4e0cf69a $ rubocop --only HashSyntax --auto-correct 
483 files inspected, 2018 offenses detected, 2018 offenses corrected
 2016-05-19 15:53:11 -04:00
Miles Gould
f29c0ad085 Replace .length calls with .size 2015-07-23 23:21:55 +01:00
Cjay
c568498941 Refactor spec/models 
- Changed before(:each) into let
- Changed :admin_ability and :cw_ability into :ability
 2015-07-09 02:21:10 +08:00
Miles Gould
9a18b4b62b Add new properties to seeds 
Added days_until_maturity, gmo, organic and heirloom properties; added
validation and tests for the last three.
 2015-01-24 11:31:35 +00:00
Taylor Griffin
f1945151c7 update RSpec true / false matchers 2014-11-16 14:40:50 +11:00
Taylor Griffin
7fc886f43c implement custom Sweeper class as stop gap against errors when running specs 2014-11-16 12:01:27 +11:00
Skud
0e401c907e Only interesting (locatable) seeds are shown on homepage 2013-08-07 16:26:51 +10:00
Skud
fd466e795b Minor tweaks to seed trading: 
- changed "Will trade to" to "Will trade" on seeds/show page
- on crop page, only list tradable seeds (not "nowhere" ones) -- did
this by adding a tradable scope to Crop
- on crop page, say "(location unknown)" where necessary
- change heading on crop page to "Find seeds"
- show "Find seeds" heading regardless of whether any are available, and
say there are none if there aren't any, along with a link to add some
- moved "sign in or sign up to add seeds" to under the Find seeds area
 2013-07-24 11:20:47 +10:00
Miles Gould
b7cbadf84a Merge branch 'dev' into seed_trade 
Conflicts:
	spec/views/crops/show.html.haml_spec.rb
 2013-07-23 12:59:41 +01:00
Skud
470f8f2f22 allow nil/blank qtys for plantings/seeds 2013-07-23 21:19:21 +10:00
Skud
bdc267b044 added slug for seeds 2013-07-23 21:14:24 +10:00
Skud
2185f257c0 set 'nowhere' as default seed.tradable_to 2013-07-23 20:43:13 +10:00
Ryan Clark
a87db0e406 Show list of seeds for trade on crop/show 2013-07-22 21:15:05 -07:00
Skud
52a00c5ed4 added numeric validation to qty for planting/seed 2013-07-22 16:40:42 +10:00
Skud
3a96cd96df removed tradable boolean field 
we're now relying just on the "tradable_to" field, which is clearer.
 2013-07-22 15:47:25 +10:00
Ryan Clark
e9dd18d977 Added tradable and tradable_to to seeds 2013-07-17 18:25:55 -07:00
Skud
91ea5146ac rails g scaffold seed... 2013-07-15 22:53:29 +10:00