From 6c8ff10d7e8e22eaa6283949d49c4580063247b1 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 8 Dec 2019 21:35:43 +1300 Subject: [PATCH] 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] * [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] * 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] * Update .travis.yml * Removed site name from homepage (#2313) --- .travis.yml | 2 +- Gemfile.lock | 2 +- app/views/home/_blurb.html.haml | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9aa1768d..acb5b3e3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ env: matrix: - GROWSTUFF_ELASTICSEARCH=true RSPEC_TAG=elasticsearch COVERAGE=true ELASTIC_SEARCH_VERSION="6.2.3" - GROWSTUFF_ELASTICSEARCH=false RSPEC_TAG=~elasticsearch COVERAGE=false - - STATIC_CHECKS=true PERCY_CHECKS=true + - STATIC_CHECKS=true PERCY=true global: - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4=" - GROWSTUFF_EMAIL="noreply@test.growstuff.org" diff --git a/Gemfile.lock b/Gemfile.lock index 07b65bd89..d3ab8b27c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -281,7 +281,7 @@ GEM rails (>= 4.2.0) letter_opener (1.7.0) launchy (~> 2.2) - listen (3.2.0) + listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.4.0) diff --git a/app/views/home/_blurb.html.haml b/app/views/home/_blurb.html.haml index d67215a67..06cb8533c 100644 --- a/app/views/home/_blurb.html.haml +++ b/app/views/home/_blurb.html.haml @@ -1,10 +1,9 @@ .row.homepage-blurb .col-md-8.info - %h1.site-name= ENV['GROWSTUFF_SITE_NAME'] %p= t('.intro', site_name: ENV['GROWSTUFF_SITE_NAME']) = render 'stats' .col-md-4 .signup %p= t('.perks') %p= link_to(t('.sign_up'), new_member_registration_path, class: 'btn btn-info btn-block') - %p= t('.already_html', sign_in: link_to(t('.sign_in_linktext'), new_member_session_path, class: 'btn btn-primary')) \ No newline at end of file + %p= t('.already_html', sign_in: link_to(t('.sign_in_linktext'), new_member_session_path, class: 'btn btn-primary'))