mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-31 05:02:02 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,122 Commits 55 Branches 76 Tags
fc152feebb5190eca583c9bd5a4eef860029bf14
Commit Graph

8122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
fc152feebb Update _quick_actions.haml 2019-12-26 23:53:26 +13:00
Brenda Wallace
9e0f35b22b fixing plantings rss feed 2019-12-26 23:22:12 +13:00
Brenda Wallace
e3a789c15e indexed items matching database attributes 2019-12-26 23:15:38 +13:00
Brenda Wallace
5783bb683a Merge branch 'dev' into cache/harvests 2019-12-26 18:15:38 +13: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
Brenda Wallace
18daad541f Merge branch 'use-slugs' into cache/harvests 2019-12-26 18:13:23 +13:00
codefactor-io
2c2d787521 [CodeFactor] Apply fixes 2019-12-26 05:13:22 +00:00
Brenda
9a704bacfc no counter cache on many to many association harvest->photos 2019-12-26 18:12:37 +13:00
Brenda
a7e915621e Index into elastic during db migration 2019-12-26 18:12:15 +13:00
dependabot-preview[bot]
28bda90329 Bump capybara from 3.29.0 to 3.30.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.29.0 to 3.30.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.29.0...3.30.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-26 05:09:31 +00:00
Brenda Wallace
fca21f85c0 Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2019-12-26 18:06:27 +13:00
Brenda Wallace
6739545bff Merge remote-tracking branch 'upstream/dev' into cache/harvests 2019-12-26 18:05:58 +13:00
Brenda
17fa995a17 Adding more counter caches 2019-12-26 16:05:30 +13:00
Brenda
d418f142e7 Routes using slugs (instead of ids) 
this seems to be intended by the models having slugs (added about 7 years ago) but the routes weren't using them
 2019-12-26 15:02:30 +13:00
Brenda Wallace
75f8a4a88a Merge branch 'dev' into cache/harvests 2019-12-26 13:54:03 +13:00
Brenda Wallace
8bacfa74ad Merge pull request #2349 from Br3nda/rails-target 
Update rubocop to represent to rails 5.2
 2019-12-26 13:53:33 +13:00
Brenda
bdee705b55 Update with frozen literals 2019-12-26 13:38:17 +13:00
Brenda
703962c0f7 Rubocop renamed cops, and fixed cops in todo file 2019-12-26 13:22:36 +13:00
Brenda
78004732d0 Update rubocop target to 5.2 2019-12-26 13:22:36 +13:00
Brenda Wallace
daf415e6cb Merge branch 'dev' into cache/harvests 2019-12-26 12:55:11 +13:00
Brenda Wallace
eab10eaf7c many to many counter caches weren't working 
and causing errors.
 2019-12-26 12:54:36 +13:00
codefactor-io
877baf22db [CodeFactor] Apply fixes to commit 2313812 2019-12-25 22:00:43 +00:00
Brenda Wallace
2313812272 Removed set_garden 2019-12-26 11:00:21 +13:00
dependabot-preview[bot]
8b97d36267 Bump rubocop-rails from 2.4.0 to 2.4.1 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.0...v2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-25 21:56:19 +00:00
Brenda Wallace
e84ab6d2a2 seeds using object instead of hash 2019-12-25 16:37:19 +13:00
Brenda Wallace
aea0d5877d use object instead of hash for displaying crops 2019-12-25 16:28:27 +13:00
Brenda Wallace
ace0977c75 plantings view using object instead of hash 2019-12-25 16:18:34 +13:00
Brenda Wallace
3835a4f936 photos from ES 2019-12-25 15:52:06 +13:00
Brenda Wallace
453d0cc795 Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2019-12-25 14:52:21 +13:00
Brenda Wallace
f42328f85e harvests#index using model-like varaibles 2019-12-25 14:52:15 +13:00
codefactor-io
950dd7f810 [CodeFactor] Apply fixes 2019-12-25 01:27:49 +00:00
Brenda Wallace
9f46009fd1 Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2019-12-25 14:27:19 +13:00
Brenda Wallace
673f977efc Photos controller using elastic search 2019-12-25 14:27:13 +13:00
Brenda Wallace
39d208dec1 Rename the search concens 2019-12-25 14:26:50 +13:00
codefactor-io
99d436a91f [CodeFactor] Apply fixes to commit 5962081 2019-12-24 22:45:59 +00:00
Brenda Wallace
5962081c9e fix specs fpr seeds rss feed 2019-12-25 11:42:29 +13:00
Brenda Wallace
2c5d5e0983 fix ruby syntax in spec 2019-12-24 22:18:14 +13:00
Brenda Wallace
b8c94c13cc refactor to use search:true instead of reindex 2019-12-24 22:15:01 +13:00
Brenda Wallace
f3ffd6c086 remove extra index runs, use search:true from spec helper 2019-12-24 22:11:14 +13:00
Brenda Wallace
ee4aa4dec3 refresh in dex at start of spec run 2019-12-24 22:10:49 +13:00
Brenda Wallace
c708d4d22b Mark spec as needing elastic search 2019-12-24 22:01:55 +13:00
Brenda Wallace
b25a13df89 fix rss feeds 2019-12-24 21:53:00 +13:00
Brenda Wallace
56c3fdd4fe index records before vie spec 2019-12-24 20:23:27 +13:00
Brenda Wallace
e6d9a3c1cf reindex into ES on homepage 2019-12-24 13:36:15 +13:00
Brenda Wallace
68b22d71d0 fixed indexing of seeds when they have no plant_before 2019-12-24 12:25:16 +13:00
Brenda Wallace
fafe611315 reinstate planting harvest and planting seeds 2019-12-24 11:54:29 +13:00
codefactor-io
df97d51940 [CodeFactor] Apply fixes 2019-12-23 22:39:08 +00:00
Brenda Wallace
4a2bb2342c Sorting out cancancan, copied to common parent controller 2019-12-24 11:38:30 +13:00
Brenda Wallace
de84214719 fixed trailing whitesapce 2019-12-24 10:45:18 +13:00