mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-01 21:21:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,986 Commits 62 Branches 76 Tags
ee05093ce58bd29e78e5eb9c1663f40a845e7836
Commit Graph

7986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
ee05093ce5 Merge remote-tracking branch 'origin/cache/harvests' into cache/harvests 2019-12-19 16:55:15 +13:00
Brenda Wallace
78e111af80 fixing paths to member harvests (with more tests too) 2019-12-19 16:54:05 +13:00
Brenda Wallace
2f3b6b3d22 member routing specs 2019-12-19 15:33:46 +13:00
codefactor-io
2558cb14f8 [CodeFactor] Apply fixes 2019-12-19 02:00:25 +00:00
Brenda Wallace
38e36c4a2c Merge remote-tracking branch 'upstream/dev' into cache/harvests 
Conflicts:
	.rubocop_todo.yml
	app/controllers/likes_controller.rb
	app/models/concerns/crop_search.rb
	app/services/crop_search_service.rb
 2019-12-19 10:28:17 +13:00
dependabot[bot]
a32df8b6c3 Bump rack from 2.0.7 to 2.0.8 (#2338) 
Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-19 08:51:01 +13:00
dependabot-preview[bot]
7575f5df68 Bump faker from 2.8.1 to 2.9.0 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.8.1 to 2.9.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.8.1...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 07:49:31 +00:00
dependabot-preview[bot]
8b8b885846 Bump rubocop-rspec from 1.37.0 to 1.37.1 
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.37.0 to 1.37.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.37.0...v1.37.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 07:36:56 +00:00
dependabot[bot]
f549cd7785 Bump excon from 0.64.0 to 0.71.0 (#2335) 
Bumps [excon](https://github.com/excon/excon) from 0.64.0 to 0.71.0.
- [Release notes](https://github.com/excon/excon/releases)
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt)
- [Commits](https://github.com/excon/excon/compare/v0.64.0...v0.71.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-17 10:08:41 +13:00
Brenda Wallace
04fd1a343a Rubocop update (#2334) 
* Update rubocop config

* Rubocop update - for rubocop 0.77

* [CodeFactor] Apply fixes

* rubocop fixes

* [CodeFactor] Apply fixes to commit 2826c2e
 2019-12-16 22:35:33 +13:00
dependabot-preview[bot]
127011f533 Bump font-awesome-sass from 5.11.2 to 5.12.0 
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.11.2 to 5.12.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.11.2...5.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 09:35:06 +00:00
Daniel O'Connor
b55f3ca385 Merge pull request #2323 from Growstuff/dependabot/bundler/haml_lint-0.34.1 
Bump haml_lint from 0.34.0 to 0.34.1
 2019-12-16 15:41:48 +10:00
Daniel O'Connor
ab3bba0358 Merge pull request #2325 from Growstuff/dependabot/bundler/scout_apm-2.6.5 
Bump scout_apm from 2.6.4 to 2.6.5
 2019-12-16 15:40:21 +10:00
dependabot-preview[bot]
b0701b837e Bump faker from 2.8.0 to 2.8.1 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.8.0 to 2.8.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/compare/v2.8.0...v2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 04:40:49 +00:00
Daniel O'Connor
940f2eeb8a Merge branch 'dev' into dependabot/bundler/scout_apm-2.6.5 2019-12-16 14:33:50 +10:00
Daniel O'Connor
c04590c28c Merge branch 'dev' into dependabot/bundler/haml_lint-0.34.1 2019-12-16 14:33:32 +10:00
Brenda Wallace
32904fede3 Merge pull request #2330 from Br3nda/search-errors 
Fix intermittent search errors
 2019-12-15 16:28:39 +13:00
codefactor-io
22d7bd6a4e [CodeFactor] Apply fixes 2019-12-15 02:58:12 +00:00
Brenda
2ec23d6a08 Remove unnecesary mapping 2019-12-15 15:56:41 +13:00
Brenda
a91a2c6ea5 Add ElasticSearch mappings, to fix intermittent errors 2019-12-15 15:56:22 +13:00
Brenda Wallace
fc69507f37 Merge pull request #2327 from Br3nda/caching 
Cache some heavy queries on models
 2019-12-14 14:18:24 +13:00
Brenda Wallace
91b399196a Cache some heavy queries on models 2019-12-14 14:03:01 +13:00
Brenda Wallace
0b9b94f1d5 Plantings#index using Elastic Search 2019-12-14 13:52:02 +13:00
Brenda Wallace
42e69fc199 Don't need to say we need ES. 2019-12-14 13:51:49 +13:00
dependabot-preview[bot]
8c08e4f143 Bump scout_apm from 2.6.4 to 2.6.5 
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.4 to 2.6.5.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.6.4...v2.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-13 07:21:05 +00:00
dependabot-preview[bot]
fcdd74b66c Bump haml_lint from 0.34.0 to 0.34.1 
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.34.0 to 0.34.1.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.34.0...v0.34.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 07:25:01 +00:00
Brenda Wallace
b343f89997 Photos indexed in elastic search 2019-12-11 11:42:34 +13:00
Brenda Wallace
c772a2984d More scaling impromvements 2019-12-11 11:40:04 +13:00
Brenda Wallace
87f0e44080 Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2019-12-11 11:39:24 +13:00
Brenda Wallace
b44877a63e Using elastic for plantings look ups 2019-12-11 11:38:34 +13:00
Brenda Wallace
b0d55ad064 Counter cache for posts 2019-12-10 20:30:57 +13:00
codefactor-io
c7e8efb1f1 [CodeFactor] Apply fixes to commit 5afe3e1 2019-12-10 00:37:06 +00:00
Brenda Wallace
5afe3e1c1e Pulling plantings from elastic search too 2019-12-10 13:36:23 +13:00
Brenda Wallace
43b7dc7d7c Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2019-12-10 09:28:37 +13:00
Brenda Wallace
be1ee2098d Use the counter for harvests 2019-12-10 09:28:20 +13:00
Brenda Wallace
e4b1a2f221 Add counter caches 2019-12-10 09:27:44 +13:00
codefactor-io
18f016766a [CodeFactor] Apply fixes to commit 282791d 2019-12-09 09:20:19 +00:00
Brenda Wallace
282791d91b Pull crops and harvests from elasticsearch 2019-12-09 22:19:20 +13:00
Brenda Wallace
bfe1b072db Memcache caching of harvests 2019-12-09 21:08:09 +13:00
Brenda Wallace
49941d3c1b Merge branch 'master' into dev 2019-12-09 12:59:25 +13:00
Brenda Wallace
7c38f7eca6 Pull homepage data directly from elasticsearch (#2316) 
* Pull homepage data directly from elasticsearch

* Removing non-elasticsearch options

* [CodeFactor] Apply fixes to commit c46b2e7
 2019-12-09 10:03:48 +13:00
Brenda Wallace
6c8ff10d7e Production release (#2318) 
* Reduce the number of queries to find if member has seed of this crop

* Don't read crop photos from db again

* Cache the footer

* Reduce queries per thumbnail.

* Reducing the number of db queries on crops#show

* Cache photos

* Add query_diet, to count queries on the page

* Fix model spec

* Put query count on the page

* Little bit less queries to look up sci name

* Turn on bullet in dev

* Tell default photo to expire in 1 hour

* Small improvements to crops controller to reduce query count

* Don't cache photo do agressively

* Fix specs

* Bump bootstrap from 4.3.1 to 4.4.1

Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.3.1 to 4.4.1.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases)
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.3.1...v4.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* [Security] Bump puma from 4.3.0 to 4.3.1

Bumps [puma](https://github.com/puma/puma) from 4.3.0 to 4.3.1. **This update includes a security fix.**
- [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.0...v4.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Move signout link into user menu

* fixed logo display on small screens

* Update specs to find logout link

* [CodeFactor] Apply fixes to commit b999d89

* Bump listen from 3.2.0 to 3.2.1

Bumps [listen](https://github.com/guard/listen) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.2.0...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update .travis.yml

* Removed site name from homepage (#2313)
 2019-12-08 21:35:43 +13:00
Brenda Wallace
81eefcbfc3 Merge remote-tracking branch 'upstream/master' into dev 2019-12-07 08:22:24 +13:00
Brenda Wallace
242d5a6641 Removed site name from homepage (#2313) 2019-12-06 22:22:21 +13:00
Brenda Wallace
8863f3289d Update .travis.yml 2019-12-06 20:54:53 +13:00
dependabot-preview[bot]
6be1f791c7 Bump listen from 3.2.0 to 3.2.1 
Bumps [listen](https://github.com/guard/listen) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.2.0...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-06 07:47:15 +00:00
Brenda Wallace
c6fc519e7d Production release (#2311) 
* Reduce the number of queries to find if member has seed of this crop

* Don't read crop photos from db again

* Cache the footer

* Reduce queries per thumbnail.

* Reducing the number of db queries on crops#show

* Cache photos

* Add query_diet, to count queries on the page

* Fix model spec

* Put query count on the page

* Little bit less queries to look up sci name

* Turn on bullet in dev

* Tell default photo to expire in 1 hour

* Small improvements to crops controller to reduce query count

* Don't cache photo do agressively

* Fix specs

* Bump bootstrap from 4.3.1 to 4.4.1

Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.3.1 to 4.4.1.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases)
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.3.1...v4.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* [Security] Bump puma from 4.3.0 to 4.3.1

Bumps [puma](https://github.com/puma/puma) from 4.3.0 to 4.3.1. **This update includes a security fix.**
- [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.0...v4.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Move signout link into user menu

* fixed logo display on small screens

* Update specs to find logout link

* [CodeFactor] Apply fixes to commit b999d89
 2019-12-06 20:46:24 +13:00
codefactor-io
021b510d35 [CodeFactor] Apply fixes to commit b999d89 2019-12-06 19:55:42 +13:00
Brenda Wallace
0dcf0d2a40 Update specs to find logout link 2019-12-06 19:55:42 +13:00
Brenda Wallace
7d4d257097 fixed logo display on small screens 2019-12-06 19:55:42 +13:00