mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-04 22:27:18 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 63 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
e1a48dc793 Bump webdrivers from 4.1.3 to 4.2.0 
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.1.3 to 4.2.0.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.1.3...v4.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 21:54:33 +00:00
Brenda Wallace
38c7bdd7c2 likes count and sorted es search data config 2019-12-30 09:51:10 +13:00
Brenda Wallace
4940b79043 more tidy, crops controller 2019-12-28 10:08:50 +13:00
Brenda Wallace
a89534da53 harvest tidy up 2019-12-28 10:06:10 +13:00
Brenda Wallace
97cacdae0e 2019-12-28 09:50:08 +13:00
Brenda Wallace
c2b4c67077 crop compantion tests 2019-12-28 09:34:04 +13:00
Brenda Wallace
233c5666ad treat harvests as object(not hash) in harvsets rss feed 2019-12-28 09:33:53 +13:00
Brenda Wallace
b9e9ce1439 index seed.active into ES 2019-12-28 09:33:36 +13:00
Brenda Wallace
8ee332edd8 update harvests controller 2019-12-28 09:20:18 +13:00
Brenda Wallace
ce909332b7 plantings controller update 2019-12-28 09:15:52 +13:00
Brenda Wallace
979d172bd7 rubocop tidy on harvests rss feed 2019-12-28 09:06:23 +13:00
Brenda Wallace
0624184270 tidying up matching attributes for seeds rss feed 2019-12-28 09:06:13 +13:00
Brenda Wallace
59130d5603 display rss feed from harvests objects (instead of hashes) 2019-12-28 08:41:47 +13:00
codefactor-io
5eea6d65d0 [CodeFactor] Apply fixes 2019-12-27 19:34:42 +00:00
Brenda Wallace
6f6edeb14a Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2019-12-28 08:34:11 +13:00
Brenda Wallace
9e6d659093 Merge branch 'dev' into cache/harvests 2019-12-28 00:29:34 +13:00
dependabot-preview[bot]
df4ae3a7f3 Bump chartkick from 3.3.0 to 3.3.1 
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.3.0 to 3.3.1.
- [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/v3.3.0...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-27 08:36:24 +00:00
Brenda Wallace
2185892cf5 Trying a different way to ES reindex in spec helper 2019-12-27 19:52:43 +13:00
codefactor-io
1bb8770a6e [CodeFactor] Apply fixes 2019-12-27 06:51:32 +00:00
Brenda Wallace
75ed36d16c Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2019-12-27 19:50:52 +13:00
Brenda Wallace
a015110b05 Reindex before running plantings controller specs 2019-12-27 19:50:46 +13:00
codefactor-io
2685cc70a7 [CodeFactor] Apply fixes to commit 1c7816c 2019-12-27 04:21:06 +00:00
Brenda Wallace
1c7816c951 fixing photos by crop query in photos controller 2019-12-27 17:20:28 +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
42e225469a 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 23:30:23 +00:00
Brenda Wallace
0d08f48b71 turn on ES indexing in some controllers 2019-12-27 09:15:53 +13:00
Brenda Wallace
23886de24b revert plantings#index spec 2019-12-27 09:07:47 +13:00
Brenda Wallace
ebdaaf0738 Merge branches 'cache/harvests' and 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2019-12-27 09:04:56 +13:00
Brenda Wallace
c6d6c3cb5c fixed link in seed card 2019-12-27 09:04:51 +13:00
Brenda Wallace
2d7951d85f Update buttons_helper.rb 2019-12-27 00:15:05 +13:00
Brenda Wallace
6c7bd77764 Update photo_capable.rb 2019-12-27 00:14:05 +13:00
Brenda Wallace
f4b87672b1 Update _actions.html.haml 2019-12-27 00:11:46 +13:00
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