mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-09 10:29:11 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,227 Commits 60 Branches 76 Tags
cdff37b2eb111b96d50cf2f7bb4d757ea11383f0
Commit Graph

8227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
cdff37b2eb style fix ups 2020-01-11 22:57:09 +13:00
Brenda Wallace
d95cacc404 style fix ups 2020-01-10 13:39:57 +13:00
Brenda Wallace
acbc49812d more indexing in home spec 2020-01-10 13:36:30 +13:00
Brenda Wallace
976b8c2058 Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2020-01-10 13:32:12 +13:00
Brenda Wallace
7a0458e7e0 reindex plantings before crop planting spec 2020-01-10 13:31:45 +13:00
Brenda Wallace
af7de3bc87 Merge branch 'dev' into cache/harvests 2020-01-10 13:30:00 +13:00
Martina Simicic
3143f0c5ee Name variable to somthing more descriptive 2020-01-09 20:00:03 +13:00
Martina Simicic
58c7576360 Jump to is only shown when viewing own gardens 2020-01-09 20:00:03 +13:00
Martina Simicic
c546088e56 Unify design for gardens index page 
Design of the page is now similar to index pages
for plantings and crops
 2020-01-09 20:00:03 +13:00
Martina Simicic
e07bb1bdb4 Add eager loading for garden owner 2020-01-09 20:00:03 +13:00
Brenda Wallace
346e67b8f3 yet more reindexing in tests 2020-01-08 15:42:25 +13:00
Brenda Wallace
8dfb8ff954 Update params in seeds controller spec 2020-01-08 08:10:16 +13:00
Brenda Wallace
0acb054004 reindex photos before likes spec 2020-01-08 07:28:53 +13:00
Brenda Wallace
2ad7f5932e Merge branch 'dev' into cache/harvests 2020-01-07 22:21:37 +13:00
dependabot-preview[bot]
a814598bed Bump jsonapi-swagger from 0.7.1 to 0.8.0 
Bumps [jsonapi-swagger](https://github.com/superiorlu/jsonapi-swagger) from 0.7.1 to 0.8.0.
- [Release notes](https://github.com/superiorlu/jsonapi-swagger/releases)
- [Commits](https://github.com/superiorlu/jsonapi-swagger/compare/v0.7.1...v0.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-07 22:21:18 +13:00
Brenda Wallace
f26aad95a2 small file fixes 2020-01-07 22:20:58 +13:00
Martina Simicic
905087ab8e Use positive statements 2020-01-07 21:31:48 +13:00
Martina Simicic
ca3b0a8c0b Add spec for showing garden type for a garden 2020-01-07 21:31:48 +13:00
Martina Simicic
9aaa18c0d3 Show garden type for a garden 2020-01-07 21:31:48 +13:00
Brenda Wallace
8a6c4a774a reindexs photo in photo controller spec 2020-01-06 21:53:02 +13:00
Brenda Wallace
bccdd6333e find the crop name from es result 2020-01-06 21:49:53 +13:00
Brenda Wallace
96f0866f39 rubocop fix up 2020-01-06 21:49:00 +13:00
Brenda Wallace
feab98e962 removing dead code 2020-01-05 21:41:16 +13:00
Brenda Wallace
c6988e2189 Re-instate the plantings quick actions 2020-01-05 21:31:51 +13:00
Brenda Wallace
e6e020dbc9 oops 2020-01-05 20:55:51 +13:00
Brenda Wallace
b7e53daeba fixes to crop photos 2020-01-05 16:57:14 +13:00
Brenda Wallace
ebb8460e44 Merge branch 'dev' into cache/harvests 2020-01-05 16:56:47 +13:00
Daniel O'Connor
88f7f09a18 Merge pull request #2360 from Growstuff/dependabot/bundler/rack-protection-2.0.8.1 
Bump rack-protection from 2.0.7 to 2.0.8.1
 2020-01-05 03:12:09 +10:30
Daniel O'Connor
fbb3eff090 Merge pull request #2364 from simicic/GH-2361_optional_garden_type 
GH-2361 Optional garden type when editing garden
 2020-01-05 03:11:18 +10:30
codefactor-io
7e30b6b6e0 [CodeFactor] Apply fixes 2020-01-03 11:28:51 +00:00
Martina Simicic
ba04c44742 Make garden type optional when editing garden 2020-01-03 09:50:33 +01:00
Brenda Wallace
2e8625d6ff Reindex harvests before harvest feature spec 2020-01-02 21:10:35 +13:00
Brenda Wallace
6acfa2827b Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2020-01-02 21:06:33 +13:00
Brenda Wallace
d757ec4fae Reindex crops, in crop browse feature spec 2020-01-02 21:06:27 +13:00
dependabot-preview[bot]
752b90ca55 Bump rack-protection from 2.0.7 to 2.0.8.1 
Bumps [rack-protection](https://github.com/sinatra/sinatra) from 2.0.7 to 2.0.8.1.
- [Release notes](https://github.com/sinatra/sinatra/releases)
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sinatra/sinatra/compare/v2.0.7...v2.0.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-02 07:35:27 +00:00
Brenda Wallace
55411ec535 Merge branch 'dev' into cache/harvests 2020-01-02 20:33:36 +13:00
dependabot-preview[bot]
8360e4ac0f Bump bullet from 6.0.2 to 6.1.0 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.2...6.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-02 20:33:10 +13:00
Brenda Wallace
f27ac12563 don't pass photos to crops/_photos 2020-01-02 20:29:41 +13:00
Brenda Wallace
fb0d57c98f Merge branches 'cache/harvests' and 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2020-01-02 20:23:37 +13:00
Brenda Wallace
ff883db279 Revert "displays photos without hitting the database" 
This reverts commit 139574c9c0.
 2020-01-02 20:23:13 +13:00
dependabot-preview[bot]
e7cf50b2ca Merge pull request #2358 from Growstuff/dependabot/bundler/faraday-0.17.3 2020-01-02 03:17:38 +00:00
dependabot-preview[bot]
7c0d184d65 Bump faraday from 0.17.1 to 0.17.3 
Bumps [faraday](https://github.com/lostisland/faraday) from 0.17.1 to 0.17.3.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v0.17.1...v0.17.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-02 02:56:42 +00:00
dependabot-preview[bot]
f666b6d100 Merge pull request #2357 from Growstuff/dependabot/bundler/comfortable_mexican_sofa-2.0.19 2020-01-02 02:54:42 +00:00
dependabot-preview[bot]
b44b0a7a5f Bump comfortable_mexican_sofa from 2.0.18 to 2.0.19 
Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa) from 2.0.18 to 2.0.19.
- [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases)
- [Commits](https://github.com/comfy/comfortable-mexican-sofa/compare/v2.0.18...v2.0.19)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-02 02:43:35 +00:00
Brenda Wallace
b556c4b8f4 Merge branch 'dev' into cache/harvests 2020-01-02 15:42:17 +13:00
Martina Simicic
1964b7ce2e Add myself to CONTRIBUTORS.md 2020-01-02 14:18:51 +13:00
Martina Simicic
9eb5fe7947 Use specific error for raise_error expectation 2020-01-02 14:18:51 +13:00
Brenda Wallace
e1b9381a03 Merge branch 'dev' into cache/harvests 2020-01-01 20:18:33 +13:00
Brenda Wallace
6017c04b5f don't check if post is liked by member, unless the member is signed in 2020-01-01 15:54:52 +13:00
Brenda Wallace
139574c9c0 displays photos without hitting the database 2020-01-01 14:15:04 +13:00