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
Brenda Wallace
793bc17692 Fix owner name in harvests on homepage 2020-01-25 08:12:21 +13:00
Brenda Wallace
d2d2c5f685 Fixed planting owner name on homepage 2020-01-25 08:11:41 +13:00
dependabot-preview[bot]
9f3d59e0e4 Merge pull request #2397 from Growstuff/dependabot/bundler/byebug-11.1.1 2020-01-24 08:01:09 +00:00
dependabot-preview[bot]
944ff39d95 Bump byebug from 11.1.0 to 11.1.1 
Bumps [byebug](https://github.com/deivid-rodriguez/byebug) from 11.1.0 to 11.1.1.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases)
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md)
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.1.0...v11.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-24 07:41:00 +00:00
dependabot-preview[bot]
1e9914dd0b Merge pull request #2396 from Growstuff/dependabot/bundler/elasticsearch-6.8.1 2020-01-23 07:58:26 +00:00
dependabot-preview[bot]
5ffcb93807 Bump elasticsearch from 6.8.0 to 6.8.1 
Bumps [elasticsearch](https://github.com/elasticsearch/elasticsearch-ruby) from 6.8.0 to 6.8.1.
- [Release notes](https://github.com/elasticsearch/elasticsearch-ruby/releases)
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/v6.8.1/CHANGELOG.md)
- [Commits](https://github.com/elasticsearch/elasticsearch-ruby/compare/v6.8.0...v6.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-23 07:38:11 +00:00
dependabot-preview[bot]
8601b8d269 Bump faraday_middleware from 0.13.1 to 0.14.0 
Bumps [faraday_middleware](https://github.com/lostisland/faraday_middleware) from 0.13.1 to 0.14.0.
- [Release notes](https://github.com/lostisland/faraday_middleware/releases)
- [Commits](https://github.com/lostisland/faraday_middleware/compare/v0.13.1...v0.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-21 22:26:08 +13:00
dependabot-preview[bot]
777262097a Bump cancancan from 3.0.1 to 3.0.2 
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases)
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.0.1...3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-21 22:26:08 +13:00
codefactor-io
4ff95fbac9 [CodeFactor] Apply fixes 2020-01-21 22:26:08 +13:00
dependabot-preview[bot]
46b612c15f Bump byebug from 11.0.1 to 11.1.0 
Bumps [byebug](https://github.com/deivid-rodriguez/byebug) from 11.0.1 to 11.1.0.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases)
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md)
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.0.1...v11.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-21 22:26:08 +13:00
dependabot-preview[bot]
a6c4ae32da Merge pull request #2390 from Growstuff/dependabot/bundler/faraday_middleware-0.14.0 2020-01-21 04:10:15 +00:00
dependabot-preview[bot]
bad93ed40d Bump faraday_middleware from 0.13.1 to 0.14.0 
Bumps [faraday_middleware](https://github.com/lostisland/faraday_middleware) from 0.13.1 to 0.14.0.
- [Release notes](https://github.com/lostisland/faraday_middleware/releases)
- [Commits](https://github.com/lostisland/faraday_middleware/compare/v0.13.1...v0.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-21 03:49:30 +00:00
dependabot-preview[bot]
61a96420ea Merge pull request #2391 from Growstuff/dependabot/bundler/cancancan-3.0.2 2020-01-21 03:47:33 +00:00
dependabot-preview[bot]
3316e68eb6 Bump cancancan from 3.0.1 to 3.0.2 
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases)
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.0.1...3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-21 03:28:18 +00:00
codefactor-io
34ddf8e98f [CodeFactor] Apply fixes 2020-01-21 13:12:28 +13:00
dependabot-preview[bot]
c4f30736db Bump byebug from 11.0.1 to 11.1.0 
Bumps [byebug](https://github.com/deivid-rodriguez/byebug) from 11.0.1 to 11.1.0.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases)
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md)
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.0.1...v11.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-21 13:08:42 +13:00
Brenda Wallace
8bf990f729 Merge pull request #2389 from Growstuff/dev 
Production release
 2020-01-20 14:30:36 +13:00
Brenda Wallace
a5fa21269f Remove Elasticsearch 6 config from travis 2020-01-20 13:34:55 +13:00
Brenda Wallace
029a703c2a Remove Elasticsearch 6 config from travis 2020-01-20 13:34:43 +13:00
Brenda Wallace
f1b5eb1fdd Turn off Replicas (#2388) 
* Control number of ES replicas

* So, let's have zero replicas on ES
 2020-01-20 13:29:19 +13:00
Brenda Wallace
51e69d79b2 Turn on elastic search 7 tests (#2386) 
* Turn on elastic search 7 tests, and  Install ES first, check later
this give ES time to start in the background instead of slowing us down
 2020-01-19 20:22:07 +13:00
dependabot-preview[bot]
17e0aa8580 Merge pull request #2380 from Growstuff/dependabot/bundler/faker-2.10.1 2020-01-18 06:25:17 +00:00
Brenda Wallace
e64e78646c Merge pull request #2382 from Growstuff/dev 
Production release
 2020-01-18 19:25:07 +13:00
dependabot-preview[bot]
6cb0f275d0 Bump faker from 2.10.0 to 2.10.1 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.0 to 2.10.1.
- [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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-18 05:34:40 +00:00
dependabot-preview[bot]
f508139c36 Merge pull request #2381 from Growstuff/dependabot/bundler/oj-3.10.1 2020-01-18 05:32:55 +00:00
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