Commit Graph

7905 Commits

Author SHA1 Message Date
dependabot-preview[bot]
5aaa1b7242 [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>
2019-12-05 23:09:48 +00:00
dependabot-preview[bot]
e9f830cb00 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>
2019-12-05 08:11:12 +00:00
Brenda Wallace
8f7f056c81 Merge pull request #2303 from Br3nda/reduce-queries
Reduce number of db queries
2019-12-04 21:33:16 +13:00
Brenda Wallace
34fcbffd24 Fix specs 2019-12-04 21:15:50 +13:00
Brenda
607eae2a43 Small improvements to crops controller to reduce query count 2019-12-04 21:02:33 +13:00
Brenda Wallace
f4484cf376 Don't cache photo do agressively 2019-12-04 21:02:33 +13:00
Brenda
c42fb5df51 Tell default photo to expire in 1 hour 2019-12-04 21:02:33 +13:00
Brenda
9159df81c9 Turn on bullet in dev 2019-12-04 21:02:33 +13:00
Brenda
56cb291508 Little bit less queries to look up sci name 2019-12-04 21:02:33 +13:00
Brenda Wallace
3ba807b610 Put query count on the page 2019-12-04 21:02:29 +13:00
Brenda Wallace
cc7aceb990 Add query_diet, to count queries on the page 2019-12-04 20:59:56 +13:00
Brenda Wallace
d22fb68eee Cache photos 2019-12-04 20:59:56 +13:00
Brenda
4065b1b248 Reducing the number of db queries on crops#show 2019-12-04 20:59:56 +13:00
Brenda
500dd5e57b Reduce queries per thumbnail. 2019-12-04 20:59:56 +13:00
Brenda Wallace
b3ecfa36cd Cache the footer 2019-12-04 20:59:56 +13:00
Brenda
b443435627 Don't read crop photos from db again 2019-12-04 20:59:56 +13:00
Brenda Wallace
fdf5a59ffd Reduce the number of queries to find if member has seed of this crop 2019-12-04 20:59:56 +13:00
Brenda Wallace
8678a6dd8a Fix model spec 2019-12-04 20:59:56 +13:00
Brenda Wallace
9e87787977 Fix color of crop action links 2019-12-03 21:48:15 +13:00
dependabot-preview[bot]
6c0462eed6 Bump faker from 2.7.0 to 2.8.0
Bumps [faker](https://github.com/faker-ruby/faker) from 2.7.0 to 2.8.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.7.0...v2.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 08:49:43 +00:00
Brenda Wallace
58d2510613 Fix signin/signout on mobile 2019-12-01 12:46:44 +13:00
Brenda Wallace
245ea3f10a Removed caching that causes facts to appear twice 2019-12-01 08:21:50 +13:00
Brenda Wallace
723fd8aa79 Remove Calistoga font from headers 2019-12-01 08:08:40 +13:00
Brenda Wallace
dc540bbd74 Merge pull request #2301 from Br3nda/fonts
Logo update
2019-12-01 07:20:35 +13:00
Brenda
dde9e69b66 consistent cards on crops#show 2019-11-30 23:17:29 +13:00
Brenda
c963533a15 add padding around logo text 2019-11-30 23:17:04 +13:00
Brenda
b1b98fd856 Trimmed edges of logo 2019-11-30 23:01:13 +13:00
Brenda
89072bdb74 Marked icons to be ignored by screen readers 2019-11-30 21:56:53 +13:00
Brenda Wallace
0a327cba67 Tidier sign-in/sign-up links 2019-11-30 21:53:23 +13:00
Brenda Wallace
9eb08bbf29 Merge css rules 2019-11-30 21:41:55 +13:00
Brenda
b40e7221e2 Enlarge the headers in jumbotrons 2019-11-30 21:14:59 +13:00
Brenda
bdefa9dad9 consistent headers 2019-11-30 20:49:54 +13:00
Brenda
bb4ea1ed0d Renamed spec so it find the renamed view 2019-11-30 20:09:54 +13:00
Brenda
fed6a7df97 Change a h3 into just a <strong> 2019-11-30 20:09:39 +13:00
Brenda
ee42fd9e87 Added calistoga font 2019-11-30 19:55:16 +13:00
Brenda Wallace
9af275225e Fixed translations on navbar 2019-11-30 19:54:51 +13:00
Brenda Wallace
285cd6b4f5 Set all headers to Calistoga font 2019-11-30 19:54:19 +13:00
Brenda Wallace
c514a57f47 Apply suggestions from code review 2019-11-30 16:34:12 +13:00
Brenda Wallace
cdc87b5511 Tidy up mobile view of logo/nav 2019-11-30 16:22:45 +13:00
Brenda Wallace
057e6f3069 Change fonts, tidy up navbar, and use text for site name 2019-11-30 16:22:45 +13:00
dependabot-preview[bot]
1570717152 Bump oj from 3.9.2 to 3.10.0
Bumps [oj](https://github.com/ohler55/oj) from 3.9.2 to 3.10.0.
- [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.9.2...v3.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-29 19:31:27 +00:00
dependabot-preview[bot]
d06f511536 Bump rubocop-rails from 2.3.2 to 2.4.0
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.2...v2.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-28 11:06:47 +00:00
dependabot-preview[bot]
fd0e91c8d5 Bump faraday from 0.17.0 to 0.17.1
Bumps [faraday](https://github.com/lostisland/faraday) from 0.17.0 to 0.17.1.
- [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.0...v0.17.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-28 10:44:44 +00:00
Brenda Wallace
4b2f9d4d8f Update rubocop on codeclimate to match gem bundle 2019-11-28 22:28:03 +13:00
dependabot-preview[bot]
9ee416ddd4 Bump rubocop from 0.76.0 to 0.77.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.76.0 to 0.77.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.76.0...v0.77.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-28 09:27:04 +00:00
dependabot-preview[bot]
7a6d54c088 Bump rubocop-rspec from 1.36.0 to 1.37.0
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.36.0 to 1.37.0.
- [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.36.0...v1.37.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-26 08:27:23 +00:00
dependabot-preview[bot]
887c2498a2 Bump loofah from 2.3.1 to 2.4.0
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.3.1 to 2.4.0.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.3.1...v2.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-26 08:07:37 +00:00
dependabot-preview[bot]
0fb5e06ac4 Bump capybara-screenshot from 1.0.23 to 1.0.24
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot) from 1.0.23 to 1.0.24.
- [Release notes](https://github.com/mattheworiordan/capybara-screenshot/releases)
- [Changelog](https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattheworiordan/capybara-screenshot/compare/v1.0.23...v1.0.24)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-25 08:20:47 +00:00
Brenda Wallace
e2dcd72472 Merge pull request #2286 from Br3nda/predict-perenial-harvest
Predict month of harvest on perennials [EDIT: show nearby harvesting months for all crops]
2019-11-25 14:56:13 +13:00
Brenda Wallace
82e2734caa USe the codeclimate gem 2019-11-25 14:03:59 +13:00