mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-08 08:08:01 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,967 Commits 62 Branches 82 Tags
RSpec/IncludeExamples
Commit Graph

11967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
4a23bcefd1 Tests tradeable and not tradeable seed saving 2020-03-02 10:21:54 +13:00
Brenda Wallace
9955d26c1b Added options from seed saving form to spec 2020-03-01 08:48:21 +13:00
Brenda
f13bc44e7e update link labels in spec 2020-03-01 08:33:04 +13:00
Brenda
5c7b8254b0 plant_part is on harvest not planting 2020-03-01 08:32:53 +13:00
Brenda
7039240bdc always show photos section on harvests 2020-03-01 07:57:19 +13:00
Brenda
cc83cb23bc fix plant part selection bug on editing harvests 2020-03-01 07:57:04 +13:00
Brenda
88ac147dda Restore old labels on buttons 2020-03-01 07:56:34 +13:00
Brenda
ef2820eb8c fix deprecation warning from faker 2020-03-01 07:56:02 +13:00
Brenda
7e42d84a21 group crop actions in to button bar 2020-03-01 07:55:47 +13:00
Brenda Wallace
0fdbac5bc3 Update plant_parts.rb 2020-02-29 23:01:00 +13:00
Brenda Wallace
46220b8275 Update plant_parts.rb 2020-02-29 22:01:02 +13:00
Brenda Wallace
4e093716f2 Add number on the end 2020-02-29 21:30:08 +13:00
Brenda Wallace
52e28f4ae2 Link new harvest to planting 2020-02-29 20:07:30 +13:00
Brenda Wallace
f4acbaa89a Use pokemon for plant parts 2020-02-29 19:53:39 +13:00
Brenda
c099580b70 Update link in spec 2020-02-29 19:49:57 +13:00
Brenda
3c392d43ee Crop#show with seeds modal 2020-02-29 19:49:49 +13:00
Brenda
bb400dabda Add new garden button on modal planting form 2020-02-29 13:37:27 +13:00
Brenda
43180bd6cb unique plantpart names in factory bot 2020-02-29 13:26:51 +13:00
Brenda
f3cd341659 add an id to the harvest modal so the test can find it 2020-02-29 13:26:36 +13:00
Brenda
fd80fc98f1 use a default icon if no plant_part icon 2020-02-29 13:26:20 +13:00
Brenda Wallace
d0154a8b60 Fall back on planting icon when plant part icon does not exist 2020-02-29 12:34:28 +13:00
Brenda
cbec6b2743 Remove harvest button from crop info card until we can distinguish between it and the planting crop button 2020-02-29 12:20:53 +13:00
Brenda Wallace
b5f7156677 Makes sure factorybot plant names point to images that exist 2020-02-29 12:09:26 +13:00
Brenda
1503b39ad3 Seed saving modal 2020-02-29 11:19:19 +13:00
Brenda Wallace
97208b99c5 Plantings modal form on crops#show 2020-02-29 10:28:32 +13:00
Brenda Wallace
777877ab06 Added plantings modal button to crop info card 2020-02-29 10:25:45 +13:00
Brenda Wallace
6c94337047 Added Plantings modal form 2020-02-29 10:23:00 +13:00
Brenda Wallace
68d157b048 Removed extra harvest button on plantings#show 2020-02-29 10:22:46 +13:00
Brenda Wallace
8dd47e0639 Added harvest button to crop info card 2020-02-29 10:09:06 +13:00
dependabot-preview[bot]
952a97f5a5 Bump puma from 4.3.1 to 4.3.2 
Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-29 10:05:56 +13:00
dependabot-preview[bot]
f58732bcab Bump will_paginate from 3.2.1 to 3.3.0 
Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](https://github.com/mislav/will_paginate/compare/v3.2.1...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-29 10:05:56 +13:00
dependabot-preview[bot]
720a0fa645 Bump better_errors from 2.5.1 to 2.6.0 
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-29 10:05:56 +13:00
dependabot-preview[bot]
af1948f95c [Security] Bump nokogiri from 1.10.7 to 1.10.8 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.10.8. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.10.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-29 10:05:56 +13:00
dependabot-preview[bot]
f7013658a5 Bump database_cleaner from 1.8.2 to 1.8.3 
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases)
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/v1.8.3/History.rdoc)
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.2...v1.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-29 10:05:56 +13:00
Brenda Wallace
a6ce1e05cf Lower case in form title 2020-02-29 10:02:47 +13:00
Brenda
8955aab2bb caching plant parts 2020-02-29 09:59:44 +13:00
Brenda Wallace
5d43575eae Merge branch 'feature/crop-action-modals' of github.com:Br3nda/growstuff into feature/crop-action-modals 
Conflicts:
app/views/harvests/_modal.html.haml
 2020-02-29 09:38:21 +13:00
Brenda Wallace
5444d15242 Merge branch 'dev' into feature/crop-action-modals 2020-02-29 09:36:36 +13:00
dependabot-preview[bot]
63c28b3b18 Bump active_utils from 3.3.16 to 3.3.17 
Bumps [active_utils](https://github.com/shopify/active_utils) from 3.3.16 to 3.3.17.
- [Release notes](https://github.com/shopify/active_utils/releases)
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md)
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.16...v3.3.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-28 20:36:24 +00:00
Brenda Wallace
b2ff247a31 Apply suggestions from code review 
Co-Authored-By: Martina  <922964+simicic@users.noreply.github.com>
 2020-02-29 09:36:05 +13:00
dependabot-preview[bot]
011ce39edb Bump puma from 4.3.1 to 4.3.2 
Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-29 09:34:25 +13:00
Brenda
d2509afca2 Harvest button on plantings 2020-02-29 09:33:40 +13:00
dependabot-preview[bot]
236caa0d32 Bump will_paginate from 3.2.1 to 3.3.0 
Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](https://github.com/mislav/will_paginate/compare/v3.2.1...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-28 10:21:28 +13:00
dependabot-preview[bot]
1c57e5266f Bump better_errors from 2.5.1 to 2.6.0 
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-28 07:16:42 +13:00
Brenda Wallace
a5c770c2b5 Update app/views/crops/_thumbnail.html.haml 
Co-Authored-By: Martina  <922964+simicic@users.noreply.github.com>
 2020-02-27 09:42:09 +13:00
Brenda Wallace
33091fbadc Merge branch 'dev' into feature/crop-action-modals 2020-02-26 11:38:38 +13:00
Brenda Wallace
94d92f8748 Merge pull request #2441 from Growstuff/dependabot/bundler/nokogiri-1.10.8 
[Security] Bump nokogiri from 1.10.7 to 1.10.8
 2020-02-25 11:40:26 +13:00
dependabot-preview[bot]
e54330a4d7 [Security] Bump nokogiri from 1.10.7 to 1.10.8 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.10.8. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.10.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 19:47:44 +00:00
Brenda
9abb84ccba Harvesting modal form 2020-02-24 11:51:37 +13:00
Brenda Wallace
9eba58839d Merge pull request #2431 from Growstuff/dependabot/bundler/database_cleaner-1.8.3 
Bump database_cleaner from 1.8.2 to 1.8.3
 2020-02-23 20:01:34 +13:00