mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-07 05:32:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 108 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot] a866032fdf Bump oj from 3.10.0 to 3.10.1 
Bumps [oj](https://github.com/ohler55/oj) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.0...v3.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-18 05:13:37 +00:00
Brenda Wallace 6279e169de approved crops only, and only 1 shard (#2385) 
reducing our elastic search usage
 2020-01-18 18:11:24 +13:00
Brenda Wallace 08be5a7de6 Fix/travis ci (#2384) 
* Upgrade to xenial on travis-ci
* Wait for ES to start
* Retry elastic search 25 times
 2020-01-18 17:41:48 +13:00
Brenda Wallace 5b764b27e1 Merge remote-tracking branch 'upstream/master' into dev 2020-01-17 18:02:56 +13:00
Brenda Wallace cd344c2605 Fix error when no latitude or longitude 2020-01-17 18:00:45 +13:00
Brenda Wallace 904b06698e Merge pull request #2379 from Growstuff/dependabot/bundler/i18n-tasks-0.9.30 
Bump i18n-tasks from 0.9.29 to 0.9.30
 2020-01-15 16:09:46 +13:00
dependabot-preview[bot] d464124522 Bump i18n-tasks from 0.9.29 to 0.9.30 
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.29 to 0.9.30.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.29...v0.9.30)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-14 07:43:44 +00:00
Brenda Wallace dd8311d347 Merge pull request #2377 from Growstuff/dev 
Production release
 2020-01-14 12:47:24 +13:00
Brenda Wallace 9ff43a0659 Merge pull request #2378 from Br3nda/dev 
Resolve dev conflicts
 2020-01-14 12:27:22 +13:00
Brenda Wallace ae26965144 Merge remote-tracking branch 'upstream/master' into dev 2020-01-14 10:37:13 +13:00
Brenda Wallace 88fd0fb91e Merge pull request #2320 from Br3nda/cache/harvests 
Reading #index lookup from ElasticSearch instead of the database
 2020-01-13 19:59:25 +13:00
codefactor-io 6c9a15f95e [CodeFactor] Apply fixes 2020-01-11 21:29:37 +00:00
Brenda Wallace cdb60d9301 Use planting, not @planting, in plantings/harvests view 2020-01-12 10:23:26 +13:00
Brenda Wallace c3f75a77ac Merge branches 'cache/harvests' and 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2020-01-12 10:20:29 +13:00
Brenda Wallace 5d8d159cc9 Update app/models/garden.rb 2020-01-12 10:20:21 +13:00
Brenda Wallace 9596d1bac7 style fix ups 2020-01-12 10:18:32 +13:00
Brenda Wallace 32c8698a44 style fix ups 2020-01-12 10:17:07 +13:00
Brenda Wallace 4ca949a703 Added another reindex to specs 2020-01-12 10:14:20 +13:00
Brenda Wallace 6cce74cf4d tests we find home page records for plantings 2020-01-12 09:52:47 +13:00
Brenda Wallace eb08584546 Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2020-01-11 23:11:00 +13:00
Brenda Wallace 709ca5a04f Fix seeds ES query 2020-01-11 23:10:33 +13:00
Brenda Wallace cdff37b2eb style fix ups 2020-01-11 22:57:09 +13:00
Brenda Wallace 27f22e4971 Merge branch 'dev' into cache/harvests 2020-01-11 21:23:46 +13:00
Brenda Wallace a5a493bbf7 Use rubocop-0-79 on codeclimate 2020-01-11 21:23:31 +13:00
dependabot-preview[bot] c5b30618c0 Bump rubocop from 0.78.0 to 0.79.0 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.78.0 to 0.79.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.78.0...v0.79.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-11 21:23:31 +13:00
Martina Simicic 2a61711c96 Name variable to somthing more descriptive 2020-01-10 16:50:52 +13:00
Martina Simicic 4893980ff0 Jump to is only shown when viewing own gardens 2020-01-10 16:50:52 +13:00
Martina Simicic 5e300f9dcf Unify design for gardens index page 
Design of the page is now similar to index pages
for plantings and crops
 2020-01-10 16:50:52 +13:00
Martina Simicic 298a20e8cc Add eager loading for garden owner 2020-01-10 16:50:52 +13:00
dependabot-preview[bot] 7645bd938d 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-10 16:50:52 +13:00
Brenda Wallace 0c7ca50880 small file fixes 2020-01-10 16:50:52 +13:00
Martina Simicic fb71a46de7 Use positive statements 2020-01-10 16:50:52 +13:00
Martina Simicic 42c8e6434c Add spec for showing garden type for a garden 2020-01-10 16:50:52 +13:00
Martina Simicic 5895b79860 Show garden type for a garden 2020-01-10 16:50:52 +13:00
Martina Simicic 0f005a3c39 Make garden type optional when editing garden 2020-01-10 16:50:52 +13:00
dependabot-preview[bot] bdce7ec64d 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-10 16:50:52 +13:00
dependabot-preview[bot] 8acd9550f4 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-10 16:50:52 +13:00
dependabot-preview[bot] 088e9a9a46 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-10 16:50:52 +13:00
dependabot-preview[bot] 103f45dd9d 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-10 16:50:52 +13:00
Martina Simicic f8287a918a Add myself to CONTRIBUTORS.md 2020-01-10 16:50:52 +13:00
Martina Simicic 9dae574de9 Use specific error for raise_error expectation 2020-01-10 16:50:52 +13:00
dependabot-preview[bot] 5297cd17cb Bump faker from 2.9.0 to 2.10.0 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.9.0...v2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-10 16:50:52 +13:00
dependabot-preview[bot] 4864cd8c56 Bump selenium-webdriver from 3.142.6 to 3.142.7 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.6 to 3.142.7.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-10 16:50:52 +13:00
dependabot-preview[bot] 307291975d 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>
 2020-01-10 16:50:52 +13:00
dependabot-preview[bot] 4870dd0214 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>
 2020-01-10 16:50:52 +13:00
codefactor-io a595a2cd8e [CodeFactor] Apply fixes to commit 17fa995 2020-01-10 16:50:52 +13:00
Brenda aab345cf09 Adding more counter caches 2020-01-10 16:50:52 +13:00
Brenda 17f5b1c562 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
 2020-01-10 16:50:52 +13:00
dependabot-preview[bot] f597dd0947 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>
 2020-01-10 16:50:52 +13:00
Brenda 7257b2ada1 Update with frozen literals 2020-01-10 16:50:52 +13:00