Commit Graph

389 Commits

Author SHA1 Message Date
Daniel O'Connor
b24b9f82e6 Rubocop - auto corrections 2022-11-06 16:34:36 +10:30
Daniel O'Connor
82d68784a7 Rubocop 2022-04-16 23:01:43 +09:30
Daniel O'Connor
c816415ae2 Remove third argument for text columns 2022-04-16 22:59:32 +09:30
Brenda Wallace
96f40c9c6b Comment out a migration that needs an old gem to work 2020-08-26 12:36:58 +12:00
Brenda Wallace
ec778394ab Upgrade to activemedian 0.2.0 2020-08-26 12:36:58 +12:00
Brenda
16895d2ddb Added missing unique constraint to garden_types 2020-08-26 12:36:58 +12:00
Brenda Wallace
9dbf8b7c8f New robocops 2020-08-26 12:36:58 +12:00
Brenda Wallace
59efe92648 Upgrade to rails 6 2020-08-26 12:36:58 +12:00
Awesome Code
c764b0a28f Auto corrected by following Lint Ruby Lint/RedundantCopDisableDirective 2020-04-14 10:49:54 +12:00
codefactor-io
4ff95fbac9 [CodeFactor] Apply fixes 2020-01-21 22:26:08 +13:00
codefactor-io
6c9a15f95e [CodeFactor] Apply fixes 2020-01-11 21:29:37 +00:00
codefactor-io
7e30b6b6e0 [CodeFactor] Apply fixes 2020-01-03 11:28:51 +00:00
Brenda Wallace
a3215d2555 Rubocop fixes 2019-12-31 14:47:15 +13:00
Brenda Wallace
38c7bdd7c2 likes count and sorted es search data config 2019-12-30 09:51:10 +13:00
Brenda Wallace
9e6d659093 Merge branch 'dev' into cache/harvests 2019-12-28 00:29:34 +13:00
codefactor-io
9e55d07705 [CodeFactor] Apply fixes to commit 17fa995 2019-12-26 23:42:11 +00:00
Brenda
460ff43a4e Adding more counter caches 2019-12-26 23:42:11 +00:00
Brenda Wallace
4d17109cd6 Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2019-12-26 18:14:45 +13:00
Brenda Wallace
bef7f5b26d Merge branch 'counter-caches' into cache/harvests
Conflicts:
	db/schema.rb
2019-12-26 18:14:33 +13:00
codefactor-io
2c2d787521 [CodeFactor] Apply fixes 2019-12-26 05:13:22 +00:00
Brenda
a7e915621e Index into elastic during db migration 2019-12-26 18:12:15 +13:00
Brenda
17fa995a17 Adding more counter caches 2019-12-26 16:05:30 +13:00
Brenda
bdee705b55 Update with frozen literals 2019-12-26 13:38:17 +13:00
Brenda Wallace
eab10eaf7c many to many counter caches weren't working
and causing errors.
2019-12-26 12:54:36 +13:00
Brenda Wallace
f42328f85e harvests#index using model-like varaibles 2019-12-25 14:52:15 +13:00
codefactor-io
e8760f9c38 [CodeFactor] Apply fixes 2019-12-20 03:33:23 +00:00
Brenda Wallace
e31f6a7c36 Index into ES after migration 2019-12-20 16:21:11 +13:00
Brenda Wallace
38e36c4a2c Merge remote-tracking branch 'upstream/dev' into cache/harvests
Conflicts:
	.rubocop_todo.yml
	app/controllers/likes_controller.rb
	app/models/concerns/crop_search.rb
	app/services/crop_search_service.rb
2019-12-19 10:28:17 +13:00
Brenda Wallace
04fd1a343a Rubocop update (#2334)
* Update rubocop config

* Rubocop update - for rubocop 0.77

* [CodeFactor] Apply fixes

* rubocop fixes

* [CodeFactor] Apply fixes to commit 2826c2e
2019-12-16 22:35:33 +13:00
Brenda Wallace
b0d55ad064 Counter cache for posts 2019-12-10 20:30:57 +13:00
Brenda Wallace
5afe3e1c1e Pulling plantings from elastic search too 2019-12-10 13:36:23 +13:00
Brenda Wallace
e4b1a2f221 Add counter caches 2019-12-10 09:27:44 +13:00
Brenda Wallace
a92710eab7 Update schema 2019-11-19 21:08:47 +13:00
Brenda Wallace
363d39705a migration goes up only 2019-11-19 16:09:01 +13:00
Brenda Wallace
327014ba73 Migrate CMS tags
copied from https://github.com/comfy/comfortable-mexican-sofa/wiki/HowTo:-Upgrade-CMS-From-1.12-to-2.0
2019-11-19 16:05:13 +13:00
codefactor-io
0ece05ca6b [CodeFactor] Apply fixes to commit 0958a13 2019-11-19 02:15:15 +00:00
Brenda Wallace
0958a134ed Finish the CMS upgrade and fix #2098 2019-11-19 15:14:08 +13:00
Brenda Wallace
b214f7ad8d linking existing plantings to their parent seeds 2019-11-01 02:23:14 +00:00
Brenda Wallace
7b5698f977 👩‍🌾 Import openfarm data (#2177)
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
2019-09-28 17:23:25 +12:00
Brenda Wallace
6a4158ae04 👭 Crop companions (#2176)
* Crop companions
* Use a nil license to mean no licence
* dependent for crop->crop_companions relationship
* Fix crop detail spec
2019-09-28 10:38:01 +12:00
Brenda Wallace
7acdc6c96f Merge remote-tracking branch 'upstream/dev' into post-comments
Conflicts:
	db/schema.rb
2019-09-26 21:14:12 +12:00
Brenda Wallace
90035e79b8 Crop to post relationship made more rails standard 2019-09-22 10:07:50 +12:00
Brenda Wallace
87e1a7571b Photo source in the schema 2019-09-21 09:45:34 +12:00
Brenda Wallace
c97e380187 Merge branch 'dev' into photo-sources 2019-09-20 22:37:02 +12:00
Brenda Wallace
b7321ed46f Add source to photos 2019-09-20 22:26:39 +12:00
Brenda Wallace
cbe5871369 Send message to everyone in migration (no email tho) 2019-08-17 16:00:18 +12:00
Brenda Wallace
c77742abab Wrapped long line 2019-08-12 09:51:05 +12:00
Brenda Wallace
44d8cd0f63 Copy timestamps from Notifications to Conversations 2019-08-11 16:55:15 +12:00
Brenda Wallace
c4b33db495 Mark read notifications as read after migrating to conversations 2019-08-11 15:50:36 +12:00
Brenda Wallace
105c2639e4 Adding timestamps to tables 2019-08-11 14:23:27 +12:00