Merge branch 'dev' into refactor-hardcoded-emails

Members - Nearest To - Memory improvements

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye
+FROM mcr.microsoft.com/devcontainers/ruby:3.4-trixie
 
 # Install Rails
 RUN gem install rails:7.0.8

.dockerignore

@@ -0,0 +1,30 @@
+.git
+.github
+.devcontainer
+log/*
+tmp/*
+!tmp/keep
+node_modules
+public/assets
+.env
+.ruby-gemset
+.editorconfig
+.esignore
+.eslintrc.json
+.haml-lint.yml
+.overcommit.yml
+.rspec
+.rubocop.yml
+.rubocop_todo.yml
+.scss-lint.yml
+.travis.yml
+.yamllint
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md
+CONTRIBUTORS.md
+LICENSE.txt
+README.md
+TECH.md
+docker-compose.yml
+Dockerfile
+.dockerignore

.github/workflows/ci-features-admin.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-comments.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-conversations.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-crops.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-gardens.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-harvests.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-home.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-members.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-places.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-plantings.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-posts.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-seeds.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-timeline.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -112,7 +112,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci.yml

@@ -76,7 +76,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -91,7 +91,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.github/workflows/docker-build-push.yml

@@ -0,0 +1,43 @@
+name: Docker Build and Push
+
+on:
+  push:
+    branches:
+      - mainline
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.rubocop.yml

@@ -24,6 +24,7 @@ Naming/FileName:
 
 RSpec/DescribeClass:
   Exclude:
+   - 'spec/tasks/import_spec.rb'
    - 'spec/views/**/*.rb'
    - 'spec/features/**/*.rb'
 
@@ -71,4 +72,7 @@ Layout/LineLength:
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/20190317023129_finished_boolean.rb'
+    - 'db/migrate/20251128200506_add_description_to_crops.rb'
+    - 'db/migrate/20240810160538_set_default_language_for_existing_alternate_names.rb'
+    - 'db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb'
     - 'db/seeds.rb'

.rubocop_todo.yml

@@ -1,33 +1,22 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-07-13 05:47:38 UTC using RuboCop version 1.65.0.
+# on 2026-04-25 16:44:38 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 231
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: link_or_button, strict
-Capybara/ClickLinkOrButtonStyle:
-  Enabled: false
-
-# Offense count: 39
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: DefaultSelector.
-Capybara/RSpec/HaveSelector:
+# Offense count: 19
+Capybara/NegationMatcherAfterVisit:
   Exclude:
-    - 'spec/features/conversations/index_spec.rb'
-    - 'spec/features/footer_spec.rb'
-    - 'spec/features/gardens/adding_gardens_spec.rb'
-    - 'spec/features/harvests/harvesting_a_crop_spec.rb'
-    - 'spec/features/members/list_spec.rb'
+    - 'spec/features/admin/reverting_crops_spec.rb'
+    - 'spec/features/crops/crop_detail_page_spec.rb'
+    - 'spec/features/crops/crop_wranglers_spec.rb'
+    - 'spec/features/gardens/gardens_spec.rb'
+    - 'spec/features/members/deletion_spec.rb'
+    - 'spec/features/members/following_spec.rb'
+    - 'spec/features/members/profile_spec.rb'
     - 'spec/features/plantings/planting_a_crop_spec.rb'
-    - 'spec/features/seeds/adding_seeds_spec.rb'
-    - 'spec/features/shared_examples/crop_suggest.rb'
-    - 'spec/helpers/application_helper_spec.rb'
-    - 'spec/support/feature_helpers.rb'
-    - 'spec/views/posts/show.html.haml_spec.rb'
 
 # Offense count: 14
 Capybara/SpecificMatcher:
@@ -43,21 +32,22 @@ Capybara/VisibilityMatcher:
   Exclude:
     - 'spec/features/shared_examples/crop_suggest.rb'
 
-# Offense count: 6
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, NonImplicitAssociationMethodNames.
 # SupportedStyles: explicit, implicit
 FactoryBot/AssociationStyle:
   Exclude:
     - 'spec/factories/alternate_names.rb'
+    - 'spec/factories/comments.rb'
     - 'spec/factories/crop.rb'
     - 'spec/factories/like.rb'
+    - 'spec/factories/notifications.rb'
     - 'spec/factories/scientific_name.rb'
 
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect, Include, EnforcedStyle, ExplicitOnly.
-# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
+# Configuration parameters: EnforcedStyle, ExplicitOnly.
 # SupportedStyles: create_list, n_times
 FactoryBot/CreateList:
   Exclude:
@@ -66,31 +56,50 @@ FactoryBot/CreateList:
     - 'spec/views/posts/index.html.haml_spec.rb'
 
 # Offense count: 4
-# Configuration parameters: Include, MaxAmount.
-# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
+# Configuration parameters: MaxAmount.
 FactoryBot/ExcessiveCreateList:
   Exclude:
     - 'spec/controllers/posts_controller_spec.rb'
     - 'spec/features/crops/show_spec.rb'
     - 'spec/features/percy/percy_spec.rb'
 
-# Offense count: 1127
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
-FactoryBot/SyntaxMethods:
-  Enabled: false
-
-# Offense count: 2
+# Offense count: 312
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/crops_helper.rb'
+    - 'app/models/concerns/search_harvests.rb'
+    - 'app/models/concerns/search_plantings.rb'
+    - 'app/models/crop.rb'
+    - 'config/sitemap.rb'
+    - 'lib/tasks/import.rake'
+    - 'spec/requests/api/v1/activities_request_spec.rb'
+    - 'spec/requests/api/v1/members_request_spec.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:
-    - 'app/helpers/crops_helper.rb'
+    - 'Gemfile'
+    - 'app/controllers/admin/versions_controller.rb'
+    - 'app/models/concerns/predict_planting.rb'
+    - 'app/models/crop.rb'
     - 'db/seeds.rb'
 
-# Offense count: 3
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Lint/AmbiguousOperatorPrecedence:
+  Exclude:
+    - 'app/controllers/activities_controller.rb'
+
+# Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: RequireParenthesesForMethodChains.
 Lint/AmbiguousRange:
@@ -98,25 +107,33 @@ Lint/AmbiguousRange:
     - 'app/models/concerns/search_activities.rb'
     - 'app/models/concerns/search_harvests.rb'
     - 'app/models/concerns/search_plantings.rb'
+    - 'db/seeds.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'app/helpers/crops_helper.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: enums
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'lib/tasks/import.rake'
 
 # Offense count: 2
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
 Lint/DuplicateBranch:
   Exclude:
     - 'app/models/harvest.rb'
     - 'lib/actions/oauth_signup_action.rb'
 
-# Offense count: 8
-# Configuration parameters: AllowComments, AllowEmptyLambdas.
-Lint/EmptyBlock:
+# Offense count: 1
+Lint/DuplicateMethods:
   Exclude:
-    - 'db/migrate/20171022032108_all_the_predictions.rb'
-    - 'spec/controllers/home_controller_spec.rb'
-    - 'spec/controllers/likes_controller_spec.rb'
-    - 'spec/controllers/plant_parts_controller_spec.rb'
-    - 'spec/factories/crop_companions.rb'
-    - 'spec/features/crops/crop_detail_page_spec.rb'
-    - 'spec/requests/authentications_spec.rb'
+    - 'app/models/planting.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -136,57 +153,80 @@ Lint/SuppressedException:
   Exclude:
     - 'lib/tasks/testing.rake'
 
-# Offense count: 7
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect.
-Lint/UselessAssignment:
+# Offense count: 1
+Lint/UselessConstantScoping:
   Exclude:
-    - 'config.rb'
-    - 'config/compass.rb'
+    - 'app/controllers/members_controller.rb'
 
-# Offense count: 52
+# Offense count: 61
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 151
+  Max: 295
 
 # Offense count: 14
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 115
+  Max: 294
 
-# Offense count: 7
+# Offense count: 10
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 188
+  Max: 298
 
-# Offense count: 6
+# Offense count: 1
+# Configuration parameters: LengthThreshold.
+Metrics/CollectionLiteralLength:
+  Exclude:
+    - 'lib/tasks/import.rake'
+
+# Offense count: 10
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 32
 
-# Offense count: 71
+# Offense count: 82
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 127
+  Max: 296
 
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 125
+  Max: 144
 
-# Offense count: 5
+# Offense count: 8
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 32
 
+# Offense count: 2
+# Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
+# AllowedMethods: call
+# WaywardPredicates: infinite?, nonzero?
+Naming/PredicateMethod:
+  Exclude:
+    - 'app/models/concerns/finishable.rb'
+    - 'app/models/seed.rb'
+
 # Offense count: 3
 RSpec/AnyInstance:
   Exclude:
     - 'spec/controllers/harvests_controller_spec.rb'
     - 'spec/controllers/photos_controller_spec.rb'
 
-# Offense count: 292
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/BeEq:
+  Exclude:
+    - 'spec/requests/api/v1/activities_request_spec.rb'
+
+# Offense count: 1
+RSpec/BeforeAfterAll:
+  Exclude:
+    - 'spec/tasks/import_spec.rb'
+
+# Offense count: 298
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -202,48 +242,12 @@ RSpec/DescribedClass:
     - 'spec/models/member_spec.rb'
     - 'spec/services/timeline_service_spec.rb'
 
-# Offense count: 13
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect.
-RSpec/EmptyExampleGroup:
-  Exclude:
-    - 'spec/controllers/authentications_controller_spec.rb'
-    - 'spec/controllers/forums_controller_spec.rb'
-    - 'spec/controllers/home_controller_spec.rb'
-    - 'spec/controllers/likes_controller_spec.rb'
-    - 'spec/controllers/plant_parts_controller_spec.rb'
-    - 'spec/controllers/seeds_controller_spec.rb'
-    - 'spec/features/crops/crop_detail_page_spec.rb'
-    - 'spec/features/plantings/planting_a_crop_spec.rb'
-    - 'spec/requests/authentications_spec.rb'
-    - 'spec/views/home/index_spec.rb'
-    - 'spec/views/photos/edit.html.haml_spec.rb'
-    - 'spec/views/posts/_single.html.haml_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowConsecutiveOneLiners.
-RSpec/EmptyLineAfterExample:
-  Exclude:
-    - 'spec/models/ability_spec.rb'
-
-# Offense count: 140
+# Offense count: 146
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 25
+  Max: 27
 
 # Offense count: 32
-RSpec/ExpectInHook:
-  Exclude:
-    - 'spec/controllers/garden_types_controller_spec.rb'
-    - 'spec/controllers/gardens_controller_spec.rb'
-    - 'spec/features/admin/forums_spec.rb'
-    - 'spec/features/admin/plant_parts_spec.rb'
-    - 'spec/features/admin/roles_spec.rb'
-    - 'spec/features/crops/crop_photos_spec.rb'
-    - 'spec/features/members/list_spec.rb'
-    - 'spec/features/plantings/planting_a_crop_spec.rb'
-    - 'spec/features/shared_examples/append_date.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -255,11 +259,30 @@ RSpec/HookArgument:
 
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect.
 RSpec/HooksBeforeExamples:
   Exclude:
     - 'spec/features/crops/creating_a_crop_spec.rb'
 
+# Offense count: 53
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/IncludeExamples:
+  Exclude:
+    - 'spec/features/conversations/index_spec.rb'
+    - 'spec/features/crops/alternate_name_spec.rb'
+    - 'spec/features/crops/browse_crops_spec.rb'
+    - 'spec/features/crops/creating_a_crop_spec.rb'
+    - 'spec/features/crops/crop_photos_spec.rb'
+    - 'spec/features/crops/delete_crop_spec.rb'
+    - 'spec/features/gardens/actions_spec.rb'
+    - 'spec/features/gardens/adding_gardens_spec.rb'
+    - 'spec/features/gardens/index_spec.rb'
+    - 'spec/features/likeable_spec.rb'
+    - 'spec/features/signout_spec.rb'
+    - 'spec/models/crop_spec.rb'
+    - 'spec/support/feature_helpers.rb'
+    - 'spec/views/photos/show.html.haml_spec.rb'
+    - 'spec/views/seeds/index.rss.haml_spec.rb'
+
 # Offense count: 37
 # Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
 RSpec/IndexedLet:
@@ -272,16 +295,15 @@ RSpec/IndexedLet:
     - 'spec/features/percy/percy_spec.rb'
     - 'spec/features/planting_reminder_spec.rb'
     - 'spec/features/timeline/index_spec.rb'
-    - 'spec/models/crop_spec.rb'
     - 'spec/models/member_spec.rb'
     - 'spec/views/forums/index.html.haml_spec.rb'
 
-# Offense count: 720
+# Offense count: 719
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Enabled: false
 
-# Offense count: 40
+# Offense count: 41
 RSpec/LetSetup:
   Enabled: false
 
@@ -307,37 +329,38 @@ RSpec/MultipleDescribes:
   Exclude:
     - 'spec/features/crops/crop_wranglers_spec.rb'
 
-# Offense count: 152
+# Offense count: 191
 RSpec/MultipleExpectations:
   Max: 19
 
-# Offense count: 138
+# Offense count: 166
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
-  Max: 20
+  Max: 16
 
-# Offense count: 133
+# Offense count: 183
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 111
+# Offense count: 109
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 6
 
-# Offense count: 403
+# Offense count: 407
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
   Enabled: false
 
-# Offense count: 3
+# Offense count: 4
 RSpec/PendingWithoutReason:
   Exclude:
     - 'spec/features/seeds/misc_seeds_spec.rb'
     - 'spec/features/unsubscribing_spec.rb'
+    - 'spec/requests/api/v1/gardens_request_spec.rb'
 
 # Offense count: 2
 RSpec/RepeatedDescription:
@@ -358,15 +381,14 @@ RSpec/RepeatedExampleGroupBody:
 
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect.
 RSpec/ScatteredSetup:
   Exclude:
     - 'spec/features/percy/percy_spec.rb'
     - 'spec/features/plantings/prediction_spec.rb'
 
 # Offense count: 1
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
-# Include: **/*_spec.rb
+# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
+# SupportedInflectors: default, active_support
 RSpec/SpecFilePathFormat:
   Exclude:
     - 'spec/controllers/member_controller_spec.rb'
@@ -380,8 +402,6 @@ RSpec/StubbedMock:
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: constant, string
 RSpec/VerifiedDoubleReference:
   Exclude:
     - 'spec/models/member_spec.rb'
@@ -394,47 +414,38 @@ RSpec/VerifiedDoubles:
     - 'spec/controllers/gardens_controller_spec.rb'
     - 'spec/views/devise/shared/_links_spec.rb'
 
-# Offense count: 7
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ResponseMethods.
-# ResponseMethods: response, last_response
-RSpecRails/HaveHttpStatus:
-  Exclude:
-    - 'spec/controllers/api/v1/plantings_controller_spec.rb'
-    - 'spec/controllers/harvests_controller_spec.rb'
-    - 'spec/controllers/likes_controller_spec.rb'
-    - 'spec/requests/harvests_spec.rb'
-
-# Offense count: 16
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Inferences.
-RSpecRails/InferredSpecType:
-  Enabled: false
-
-# Offense count: 28
-# Configuration parameters: Database, Include.
+# Offense count: 30
+# Configuration parameters: Database.
 # SupportedDatabases: mysql, postgresql
-# Include: db/**/*.rb
 Rails/BulkChangeTable:
   Enabled: false
 
 # Offense count: 4
-# Configuration parameters: Include.
-# Include: db/**/*.rb
 Rails/CreateTableWithTimestamps:
   Exclude:
     - 'db/migrate/20150201052245_create_cms.rb'
     - 'db/migrate/20171022032108_all_the_predictions.rb'
 
-# Offense count: 1
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowToTime.
 # SupportedStyles: strict, flexible
 Rails/Date:
   Exclude:
+    - 'app/controllers/activities_controller.rb'
     - 'app/mailers/notifier_mailer.rb'
+    - 'app/models/concerns/search_seeds.rb'
+    - 'spec/features/activities/creating_a_recurring_activity_spec.rb'
 
-# Offense count: 11
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: slashes, arguments
+Rails/FilePath:
+  Exclude:
+    - 'lib/tasks/import.rake'
+
+# Offense count: 12
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 # AllowedMethods: order, limit, select, lock
@@ -445,38 +456,35 @@ Rails/FindEach:
     - 'db/migrate/20171129041341_create_photographings.rb'
     - 'db/migrate/20190130090437_add_crop_to_photographings.rb'
     - 'db/migrate/20191119030244_cms_tags.rb'
+    - 'lib/tasks/wikidata.rake'
 
 # Offense count: 2
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
   Exclude:
     - 'app/models/member.rb'
     - 'app/models/role.rb'
 
-# Offense count: 5
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
+# Offense count: 6
 Rails/HasManyOrHasOneDependent:
   Exclude:
+    - 'app/models/crop.rb'
     - 'app/models/member.rb'
 
 # Offense count: 1
-# Configuration parameters: Include.
-# Include: spec/**/*.rb, test/**/*.rb
 Rails/I18nLocaleAssignment:
   Exclude:
     - 'spec/features/locale_spec.rb'
 
-# Offense count: 33
-Rails/I18nLocaleTexts:
-  Enabled: false
+# Offense count: 1
+# Configuration parameters: IgnoreScopes.
+Rails/InverseOf:
+  Exclude:
+    - 'app/models/member.rb'
 
-# Offense count: 3
-# Configuration parameters: Include.
-# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
+# Offense count: 4
 Rails/LexicallyScopedActionFilter:
   Exclude:
+    - 'app/controllers/api/v1/base_controller.rb'
     - 'app/controllers/data_controller.rb'
     - 'app/controllers/registrations_controller.rb'
 
@@ -492,17 +500,23 @@ Rails/PluralizationGrammar:
   Exclude:
     - 'spec/requests/plantings_spec.rb'
 
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Rails/Presence:
+  Exclude:
+    - 'app/controllers/photos_controller.rb'
+    - 'app/controllers/plantings_controller.rb'
+    - 'app/models/concerns/open_farm_data.rb'
+
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: **/Rakefile, **/*.rake
 Rails/RakeEnvironment:
   Exclude:
     - 'lib/tasks/hooks.rake'
     - 'lib/tasks/i18n.rake'
     - 'lib/tasks/testing.rake'
 
-# Offense count: 9
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedReceivers.
 # AllowedReceivers: ActionMailer::Preview, ActiveSupport::TimeZone
@@ -513,9 +527,8 @@ Rails/RedundantActiveRecordAllMethod:
     - 'app/controllers/forums_controller.rb'
     - 'app/controllers/plant_parts_controller.rb'
     - 'app/controllers/scientific_names_controller.rb'
-    - 'app/services/openfarm_service.rb'
+    - 'spec/features/members/deletion_spec.rb'
     - 'spec/features/percy/percy_spec.rb'
-    - 'spec/models/harvest_spec.rb'
 
 # Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -526,14 +539,13 @@ Rails/RedundantPresenceValidationOnBelongsTo:
     - 'app/models/planting.rb'
     - 'app/models/scientific_name.rb'
 
-# Offense count: 15
+# Offense count: 16
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: spec/controllers/**/*.rb, spec/requests/**/*.rb, test/controllers/**/*.rb, test/integration/**/*.rb
 Rails/ResponseParsedBody:
   Exclude:
     - 'spec/controllers/api/v1/plantings_controller_spec.rb'
     - 'spec/controllers/likes_controller_spec.rb'
+    - 'spec/requests/api/v1/activities_request_spec.rb'
     - 'spec/requests/api/v1/crop_request_spec.rb'
     - 'spec/requests/api/v1/gardens_request_spec.rb'
     - 'spec/requests/api/v1/harvests_request_spec.rb'
@@ -543,29 +555,35 @@ Rails/ResponseParsedBody:
     - 'spec/requests/api/v1/seeds_request_spec.rb'
 
 # Offense count: 9
-# Configuration parameters: Include.
-# Include: db/**/*.rb
 Rails/ReversibleMigration:
   Exclude:
     - 'db/migrate/20130326092227_change_planted_at_to_date.rb'
     - 'db/migrate/20191119020643_upgrade_cms.rb'
 
-# Offense count: 2
+# Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/RootPathnameMethods:
   Exclude:
     - 'app/controllers/crops_controller.rb'
     - 'app/helpers/icons_helper.rb'
+    - 'config/application.rb'
+    - 'lib/tasks/import.rake'
+    - 'spec/rails_helper.rb'
 
 # Offense count: 21
-# Configuration parameters: Include.
-# Include: db/**/*.rb
 Rails/ThreeStateBooleanColumn:
   Enabled: false
 
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:
+  Exclude:
+    - 'app/controllers/activities_controller.rb'
+    - 'spec/features/harvests/harvesting_a_crop_spec.rb'
+
 # Offense count: 6
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
 Rails/UniqueValidationWithoutIndex:
   Exclude:
     - 'app/models/follow.rb'
@@ -583,24 +601,28 @@ Rails/WhereEquals:
     - 'app/models/harvest.rb'
     - 'app/models/planting.rb'
 
-# Offense count: 2
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/WhereRange:
   Exclude:
     - 'app/models/concerns/predict_planting.rb'
     - 'app/models/garden.rb'
+    - 'app/models/seed.rb'
 
 # Offense count: 1
 Rake/MethodDefinitionInTask:
   Exclude:
     - 'lib/tasks/growstuff.rake'
 
-# Offense count: 3
+# Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
 # SupportedStyles: nested, compact
+# SupportedStylesForClasses: ~, nested, compact
+# SupportedStylesForModules: ~, nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
+    - 'app/controllers/admin/crops_controller.rb'
     - 'lib/actions/oauth_signup_action.rb'
     - 'lib/haml/filters/escaped_markdown.rb'
     - 'lib/haml/filters/growstuff_markdown.rb'
@@ -615,30 +637,52 @@ Style/CommentedKeyword:
     - 'spec/models/planting_spec.rb'
 
 # Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedVars, DefaultToNil.
+Style/FetchEnvVar:
+  Exclude:
+    - 'config/sitemap.rb'
+
+# Offense count: 2
+Style/FileOpen:
+  Exclude:
+    - 'app/helpers/application_helper.rb'
+    - 'db/seeds.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: left_coerce, right_coerce, single_coerce, fdiv
+Style/FloatDivision:
+  Exclude:
+    - 'app/models/concerns/predict_planting.rb'
+
+# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Exclude:
-    - 'config/initializers/new_framework_defaults_6_0.rb'
-    - 'db/migrate/20200801084007_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb'
     - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
 
-# Offense count: 3
+# Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
   Exclude:
     - 'config/environments/production.rb'
     - 'lib/tasks/gbif.rake'
-    - 'lib/tasks/openfarm.rake'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/IdenticalConditionalBranches:
+  Exclude:
+    - 'lib/actions/oauth_signup_action.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: nonzero?
-Style/IfWithBooleanLiteralBranches:
+Style/MapIntoArray:
   Exclude:
-    - 'app/controllers/gardens_controller.rb'
+    - 'app/helpers/crops_helper.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -660,12 +704,13 @@ Style/MutableConstant:
   Exclude:
     - 'app/models/activity.rb'
 
-# Offense count: 5
+# Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
+    - 'app/controllers/activities_controller.rb'
     - 'app/helpers/crops_helper.rb'
     - 'app/helpers/harvests_helper.rb'
     - 'app/helpers/plantings_helper.rb'
@@ -676,11 +721,12 @@ Style/OpenStructUse:
   Exclude:
     - 'spec/helpers/event_helper_spec.rb'
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
   Exclude:
+    - 'app/helpers/application_helper.rb'
     - 'app/models/concerns/member_newsletter.rb'
 
 # Offense count: 1
@@ -697,20 +743,34 @@ Style/RedundantFetchBlock:
   Exclude:
     - 'config/puma.rb'
 
-# Offense count: 2
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/RedundantInterpolation:
+  Exclude:
+    - 'app/helpers/buttons_helper.rb'
+
+# Offense count: 4
+# Configuration parameters: Max.
+Style/SafeNavigationChainLength:
+  Exclude:
+    - 'app/models/ability.rb'
+
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowModifier.
 Style/SoleNestedConditional:
   Exclude:
+    - 'app/controllers/activities_controller.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/messages_controller.rb'
 
-# Offense count: 24
+# Offense count: 27
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
     - 'app/controllers/messages_controller.rb'
+    - 'app/controllers/registrations_controller.rb'
     - 'app/helpers/buttons_helper.rb'
     - 'config/initializers/rswag_api.rb'
     - 'spec/helpers/gardens_helper_spec.rb'

.ruby-version

@@ -1 +1 @@
-3.3.8
+3.4.8

.scss-lint.yml

@@ -248,6 +248,3 @@ linters:
 
   ZeroUnit:
     enabled: true
-
-  Compass::*:
-    enabled: false

.travis.yml

@@ -1,31 +0,0 @@
-sudo: required
-language: ruby
-dist: bionic
-branches:
-  only:
-    - mainline
-    - dev
-cache:
-  bundler: true
-  yarn: true
-  directories:
-    - tmp/cache/assets/test/sprockets
-env:
-  global:
-    - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
-before_deploy:
-  - bundle exec script/heroku_maintenance.rb on
-deploy:
-  provider: heroku
-  api_key:
-    secure: "WrQxf0fEKkCdXrjcejurobOnNNz3he4dDwjBbToXbQTQNDObPp7NetJrLsfM8FiUFEeOuvhIHHiDQtMvY720zGGAGxDptvgFS+0QHCUqoTRZA/yFfUmHlG2jROXTzk5uVK0AE4k6Ion5kX8+mM0EnMT/7u+MTFiukrJctSiEXfg="
-  on:
-    repo: Growstuff/growstuff
-  app:
-    dev: growstuff-staging
-    mainline: growstuff-prod
-  run:
-    - "script/deploy-tasks.sh"
-    - restart
-after_deploy:
-  - bundle exec script/heroku_maintenance.rb off

Dockerfile

@@ -0,0 +1,52 @@
+FROM ruby:3.4.8-trixie
+
+# Install system dependencies
+RUN apt-get update -qq && \
+    apt-get install -y --no-install-recommends \
+    build-essential \
+    libpq-dev \
+    git \
+    curl \
+    gnupg2 \
+    shared-mime-info \
+    libvips \
+    && curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
+    && apt-get install -y --no-install-recommends nodejs \
+    && npm install -g yarn \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set production environment
+ENV RAILS_ENV=production \
+    BUNDLE_WITHOUT="development test" \
+    RAILS_SERVE_STATIC_FILES=true \
+    RAILS_LOG_TO_STDOUT=true
+
+WORKDIR /app
+
+# Install gems
+COPY Gemfile Gemfile.lock ./
+RUN bundle config set --local deployment 'true' && \
+    bundle config set --local without 'development test' && \
+    bundle install --jobs 4 --retry 3
+
+# Install JavaScript dependencies
+COPY package.json yarn.lock ./
+RUN yarn install --check-files
+
+# Copy the application code
+COPY . .
+
+# Precompile assets
+# Secret key base is needed for asset compilation but doesn't need to be the real one
+RUN RAILS_ENV=production SECRET_KEY_BASE_DUMMY=1 bundle exec rake assets:precompile
+
+# Add a script to be executed every time the container starts.
+COPY entrypoint.sh /usr/bin/
+RUN chmod +x /usr/bin/entrypoint.sh
+ENTRYPOINT ["entrypoint.sh"]
+
+EXPOSE 3000
+
+# Start the main process.
+CMD ["bundle", "exec", "puma", "-C", "config/puma.rb"]

Gemfile

@@ -136,6 +136,11 @@ gem "gbifrb"
 
 gem "msgpack"
 
+# Pinned due to RAILS_ENV=production bundle exec rake assets:precompile failing with ArgumentError: wrong number of arguments (given 1, expected 0) (ArgumentError)
+# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/connection_pool-3.0.2/lib/connection_pool.rb:48:in `initialize'
+# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/activesupport-7.2.3/lib/active_support/cache/mem_cache_store.rb:63:in `new'
+gem "connection_pool", "< 3"
+
 group :production do
   gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
   gem 'dalli'
@@ -195,10 +200,9 @@ group :test do
   gem 'vcr'
 end
 
-group :travis do
-  gem 'platform-api'
-end
-
 gem "i18n_data", "~> 1.1"
 
 gem "paper_trail", "~> 17.0"
+
+gem 'aws-sdk-s3', '~> 1', '>= 1.114.0'
+gem 'sitemap_generator'

Gemfile.lock

@@ -33,29 +33,29 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.3)
-      actionpack (= 7.2.3)
-      activesupport (= 7.2.3)
+    actioncable (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.3)
-      actionpack (= 7.2.3)
-      activejob (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    actionmailbox (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       mail (>= 2.8.0)
-    actionmailer (7.2.3)
-      actionpack (= 7.2.3)
-      actionview (= 7.2.3)
-      activejob (= 7.2.3)
-      activesupport (= 7.2.3)
+    actionmailer (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      actionview (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.3)
-      actionview (= 7.2.3)
-      activesupport (= 7.2.3)
+    actionpack (7.2.3.1)
+      actionview (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       cgi
       nokogiri (>= 1.8.5)
       racc
@@ -65,15 +65,15 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.3)
-      actionpack (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    actiontext (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.3)
-      activesupport (= 7.2.3)
+    actionview (7.2.3.1)
+      activesupport (= 7.2.3.1)
       builder (~> 3.1)
       cgi
       erubi (~> 1.11)
@@ -82,29 +82,29 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    active_median (0.6.0)
-      activesupport (>= 7.1)
+    active_median (1.0.0)
+      activesupport (>= 7.2)
     active_record_union (1.4.0)
       activerecord (>= 6.0)
     active_utils (3.6.0)
       activesupport (>= 4.2)
       i18n
-    activejob (7.2.3)
-      activesupport (= 7.2.3)
+    activejob (7.2.3.1)
+      activesupport (= 7.2.3.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.3)
-      activesupport (= 7.2.3)
-    activerecord (7.2.3)
-      activemodel (= 7.2.3)
-      activesupport (= 7.2.3)
+    activemodel (7.2.3.1)
+      activesupport (= 7.2.3.1)
+    activerecord (7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       timeout (>= 0.4.0)
-    activestorage (7.2.3)
-      actionpack (= 7.2.3)
-      activejob (= 7.2.3)
-      activerecord (= 7.2.3)
-      activesupport (= 7.2.3)
+    activestorage (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       marcel (~> 1.0)
-    activesupport (7.2.3)
+    activesupport (7.2.3.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -113,23 +113,42 @@ GEM
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
-      minitest (>= 5.1)
+      minitest (>= 5.1, < 6)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    axe-core-api (4.11.0)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1240.0)
+    aws-sdk-core (3.245.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-kms (1.123.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.220.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+    axe-core-api (4.11.2)
       dumb_delegator
       ostruct
       virtus
-    axe-core-capybara (4.11.0)
-      axe-core-api (= 4.11.0)
+    axe-core-capybara (4.11.2)
+      axe-core-api (= 4.11.2)
       dumb_delegator
-    axe-core-rspec (4.11.0)
-      axe-core-api (= 4.11.0)
+    axe-core-rspec (4.11.2)
+      axe-core-api (= 4.11.2)
       dumb_delegator
       ostruct
       virtus
@@ -138,13 +157,13 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.3.0)
-    bcrypt (3.1.20)
+    bcrypt (3.1.22)
     benchmark (0.5.0)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.3.1)
+    bigdecimal (4.1.2)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (7.0.1)
       elasticsearch-model (< 8)
@@ -158,10 +177,11 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.3.0)
-    bullet (8.1.0)
+    bullet (8.1.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    byebug (12.0.0)
+    byebug (13.0.0)
+      reline (>= 0.6.0)
     cancancan (3.6.1)
     capybara (3.40.0)
       addressable
@@ -175,7 +195,7 @@ GEM
     capybara-email (3.0.2)
       capybara (>= 2.4, < 4.0)
       mail
-    capybara-screenshot (1.0.26)
+    capybara-screenshot (1.0.27)
       capybara (>= 1.0, < 4)
       launchy
     carrierwave (3.0.7)
@@ -185,9 +205,10 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    cgi (0.5.0)
+    cgi (0.5.1)
     chartkick (5.2.1)
-    childprocess (5.0.0)
+    childprocess (5.1.0)
+      logger (~> 1.5)
     coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -200,7 +221,7 @@ GEM
     coffee-script-source (1.12.2)
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
-    concurrent-ruby (1.3.5)
+    concurrent-ruby (1.3.6)
     connection_pool (2.5.5)
     crass (1.0.6)
     crowdin-api (1.12.0)
@@ -215,29 +236,30 @@ GEM
     csv_shaper (1.4.0)
       activesupport (>= 3.0.0)
       csv
-    dalli (3.2.8)
+    dalli (5.0.2)
+      logger
     database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.5.0)
+    date (3.5.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.9.4)
+    devise (5.0.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
+      railties (>= 7.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.6.2)
     discard (1.4.0)
       activerecord (>= 4.2, < 9.0)
     domain_name (0.6.20240107)
-    dotenv (3.1.8)
-    dotenv-rails (3.1.8)
-      dotenv (= 3.1.8)
+    dotenv (3.2.0)
+    dotenv-rails (3.2.0)
+      dotenv (= 3.2.0)
       railties (>= 6.1)
     drb (2.2.3)
     dumb_delegator (1.1.0)
@@ -254,30 +276,28 @@ GEM
     elasticsearch-transport (7.0.0)
       faraday
       multi_json
-    erb (6.0.0)
+    erb (6.0.2)
     erubi (1.13.1)
-    erubis (2.7.0)
-    excon (1.2.5)
-      logger
     execjs (2.10.0)
     factory_bot (6.5.5)
       activesupport (>= 6.1.0)
     factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
-    faker (3.5.2)
+    faker (3.8.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.0)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.1)
-      net-http (>= 0.5.0)
-    ffi (1.16.3)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
+    ffi (1.17.3)
+    ffi (1.17.3-x86_64-linux-gnu)
     flickraw (0.9.10)
     font-awesome-sass (5.15.1)
       sassc (>= 1.11)
-    friendly_id (5.5.1)
+    friendly_id (5.6.0)
       activerecord (>= 4.0.0)
     gbifrb (0.2.0)
     geocoder (1.8.6)
@@ -293,7 +313,7 @@ GEM
     gravatar-ultimate (2.0.0)
       activesupport (>= 2.3.14)
       rack
-    haml (7.0.2)
+    haml (7.2.0)
       temple (>= 0.8.2)
       thor
       tilt
@@ -302,30 +322,24 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.67.0)
+    haml_lint (0.73.0)
       haml (>= 5.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
-    hashie (5.0.0)
-    heroics (0.1.3)
-      base64
-      erubis (~> 2.0)
-      excon
-      moneta
-      multi_json (>= 1.9.2)
-      webrick
+    hashie (5.1.0)
+      logger
     highline (3.1.2)
       reline
     http-accept (1.7.0)
     http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httparty (0.22.0)
+    httparty (0.24.0)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.1.2)
       activesupport (>= 4.0.2)
@@ -341,7 +355,7 @@ GEM
       terminal-table (>= 1.5.1)
     i18n_data (1.1.0)
       simple_po_parser (~> 1.1)
-    icalendar (2.12.1)
+    icalendar (2.12.2)
       base64
       ice_cube (~> 0.16)
       logger
@@ -351,19 +365,21 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.1)
-    irb (1.15.3)
+    io-console (0.8.2)
+    irb (1.17.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
+    jmespath (1.6.2)
     jquery-rails (4.6.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.16.0)
-    json-schema (6.0.0)
+    json (2.19.3)
+    json-schema (6.2.0)
       addressable (~> 2.8)
-      bigdecimal (~> 3.1)
+      bigdecimal (>= 3.1, < 5)
     jsonapi-resources (0.10.7)
       activerecord (>= 4.1)
       concurrent-ruby
@@ -373,20 +389,22 @@ GEM
     kramdown (2.4.0)
       rexml
     language_server-protocol (3.17.0.5)
-    launchy (3.0.1)
+    launchy (3.1.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
+      logger (~> 1.6)
     leaflet-rails (1.9.5)
       actionpack (>= 4.2.0)
       railties (>= 4.2.0)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     lint_roller (1.1.0)
-    listen (3.9.0)
+    listen (3.10.0)
+      logger
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.24.1)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.9.0)
@@ -404,7 +422,7 @@ GEM
       sass (>= 3.5.2)
     material_icons (4.0.0)
       railties (>= 3.2)
-    matrix (0.4.2)
+    matrix (0.4.3)
     memcachier (0.0.2)
     method_source (1.1.0)
     mime-types (3.7.0)
@@ -417,14 +435,13 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.26.2)
-    moneta (1.0.0)
+    minitest (5.27.0)
     msgpack (1.8.0)
-    multi_json (1.15.0)
-    multi_xml (0.7.1)
-      bigdecimal (~> 3.1)
-    net-http (0.6.0)
-      uri
+    multi_json (1.19.1)
+    multi_xml (0.8.1)
+      bigdecimal (>= 3.1, < 5)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
     net-imap (0.5.12)
       date
       net-protocol
@@ -436,13 +453,13 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.5)
-    nokogiri (1.18.10)
+    nokogiri (1.19.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-gnu)
+    nokogiri (1.19.2-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.12)
+    oj (3.17.0)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -460,35 +477,32 @@ GEM
     paper_trail (17.0.0)
       activerecord (>= 7.1)
       request_store (~> 1.4)
-    parallel (1.27.0)
-    parser (3.3.10.0)
+    parallel (2.0.1)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     percy-capybara (5.0.0)
       capybara (>= 3)
-    pg (1.6.2)
-    pg (1.6.2-x86_64-linux)
-    platform-api (3.8.0)
-      heroics (~> 0.1.1)
-      moneta (~> 1.0.0)
-      rate_throttle_client (~> 0.1.0)
+    pg (1.6.3)
+    pg (1.6.3-x86_64-linux)
     popper_js (2.11.8)
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.6.0)
-    pry (0.15.2)
+    prism (1.9.0)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (5.2.6)
+      reline (>= 0.6.0)
+    psych (5.3.1)
       date
       stringio
-    public_suffix (6.0.2)
-    puma (7.1.0)
+    public_suffix (7.0.5)
+    puma (8.0.0)
       nio4r (~> 2.0)
     query_diet (0.7.3)
     racc (1.8.1)
-    rack (2.2.21)
+    rack (2.2.23)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -501,20 +515,20 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.2.3)
-      actioncable (= 7.2.3)
-      actionmailbox (= 7.2.3)
-      actionmailer (= 7.2.3)
-      actionpack (= 7.2.3)
-      actiontext (= 7.2.3)
-      actionview (= 7.2.3)
-      activejob (= 7.2.3)
-      activemodel (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    rails (7.2.3.1)
+      actioncable (= 7.2.3.1)
+      actionmailbox (= 7.2.3.1)
+      actionmailer (= 7.2.3.1)
+      actionpack (= 7.2.3.1)
+      actiontext (= 7.2.3.1)
+      actionview (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       bundler (>= 1.15.0)
-      railties (= 7.2.3)
+      railties (= 7.2.3.1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -523,8 +537,8 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
@@ -534,9 +548,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.2.3)
-      actionpack (= 7.2.3)
-      activesupport (= 7.2.3)
+    railties (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       cgi
       irb (~> 1.13)
       rackup (>= 1.0.0)
@@ -546,19 +560,18 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     raindrops (0.20.1)
-    rake (13.3.1)
-    rate_throttle_client (0.1.2)
+    rake (13.4.2)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.16.1)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
-    recaptcha (5.21.1)
-    redis-client (0.23.2)
+    recaptcha (5.21.2)
+    redis-client (0.26.2)
       connection_pool
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     reline (0.6.3)
       io-console (~> 0.5)
     request_store (1.7.0)
@@ -586,20 +599,20 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (8.0.2)
+    rspec-rails (8.0.4)
       actionpack (>= 7.2)
       activesupport (>= 7.2)
       railties (>= 7.2)
-      rspec-core (~> 3.13)
-      rspec-expectations (~> 3.13)
-      rspec-mocks (~> 3.13)
-      rspec-support (~> 3.13)
+      rspec-core (>= 3.13.0, < 5.0.0)
+      rspec-expectations (>= 3.13.0, < 5.0.0)
+      rspec-mocks (>= 3.13.0, < 5.0.0)
+      rspec-support (>= 3.13.0, < 5.0.0)
     rspec-rebound (0.2.1)
       rspec-core (~> 3.3)
-    rspec-support (3.13.6)
+    rspec-support (3.13.7)
     rspectre (0.2.0)
       parser (>= 3.3.7.1)
       prism (~> 1.3)
@@ -615,27 +628,27 @@ GEM
     rswag-ui (2.17.0)
       actionpack (>= 5.2, < 8.2)
       railties (>= 5.2, < 8.2)
-    rubocop (1.81.7)
+    rubocop (1.86.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.48.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.34.2)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -644,7 +657,7 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.8.0)
+    rubocop-rspec (3.9.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
     rubocop-rspec_rails (2.32.0)
@@ -655,7 +668,7 @@ GEM
     ruby-units (4.1.0)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
-    rubyzip (3.2.1)
+    rubyzip (3.2.2)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -669,25 +682,27 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (5.8.0)
+    scout_apm (6.2.0)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.38.0)
+    selenium-webdriver (4.43.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
-    sidekiq (7.3.9)
+    sidekiq (7.3.10)
       base64
-      connection_pool (>= 2.3.0)
+      connection_pool (>= 2.3.0, < 3)
       logger
-      rack (>= 2.2.4)
-      redis-client (>= 0.22.2)
+      rack (>= 2.2.4, < 3.3)
+      redis-client (>= 0.23.0, < 1)
     simple_po_parser (1.1.6)
+    sitemap_generator (6.3.0)
+      builder (~> 3.0)
     sprockets (3.7.5)
       base64
       concurrent-ruby (~> 1.0)
@@ -697,35 +712,34 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.1.8)
+    stringio (3.2.0)
     sysexits (1.2.0)
     temple (0.10.4)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    terser (1.2.6)
+    terser (1.2.7)
       execjs (>= 0.3.0, < 3)
-    thor (1.4.0)
+    thor (1.5.0)
     thread_safe (0.3.6)
-    tilt (2.6.1)
-    timecop (0.9.10)
-    timeout (0.4.4)
+    tilt (2.7.0)
+    timecop (0.9.11)
+    timeout (0.5.0)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
-    unicode-emoji (4.1.0)
+    unicode-emoji (4.2.0)
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.18.0)
-    uri (1.0.3)
+    uri (1.1.1)
     useragent (0.16.11)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    vcr (6.3.1)
-      base64
+    vcr (6.4.0)
     virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -745,11 +759,12 @@ GEM
     will_paginate (4.0.1)
     will_paginate-bootstrap-style (0.3.0)
       will_paginate (~> 4.0, >= 4.0.0)
-    xmlrpc (0.3.3)
+    xmlrpc (0.3.4)
+      rexml
       webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.3)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   ruby
@@ -759,6 +774,7 @@ DEPENDENCIES
   active_median
   active_record_union
   active_utils
+  aws-sdk-s3 (~> 1, >= 1.114.0)
   axe-core-capybara
   axe-core-rspec
   better_errors
@@ -777,6 +793,7 @@ DEPENDENCIES
   chartkick
   coffee-rails
   comfortable_mexican_sofa!
+  connection_pool (< 3)
   crowdin-cli
   csv_shaper
   dalli
@@ -821,7 +838,6 @@ DEPENDENCIES
   paper_trail (~> 17.0)
   percy-capybara (~> 5.0.0)
   pg
-  platform-api
   pry
   puma
   query_diet
@@ -854,6 +870,7 @@ DEPENDENCIES
   searchkick
   selenium-webdriver
   sidekiq
+  sitemap_generator
   sprockets (< 4)
   terser
   timecop
@@ -866,7 +883,7 @@ DEPENDENCIES
   xmlrpc
 
 RUBY VERSION
-   ruby 3.3.8p144
+   ruby 3.4.8p72
 
 BUNDLED WITH
    2.4.22

app/assets/stylesheets/application.scss

@@ -33,4 +33,4 @@
 
 @view-transition {
   navigation: auto;
-}
+}

app/controllers/admin/crop_companions_controller.rb

@@ -15,7 +15,7 @@ module Admin
     def create
       @crop_companion = @crop.crop_companions.new(crop_companion_params)
       if @crop_companion.save
-        redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully created.'
+        redirect_to admin_crop_crop_companions_path(@crop), notice: t('crop_companions.created')
       else
         render :new
       end
@@ -24,7 +24,7 @@ module Admin
     def destroy
       @crop_companion = @crop.crop_companions.find(params[:id])
       @crop_companion.destroy
-      redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully destroyed.'
+      redirect_to admin_crop_crop_companions_path(@crop), notice: t('crop_companions.deleted')
     end
 
     private

app/controllers/admin/members_controller.rb

@@ -8,9 +8,9 @@ module Admin
     responders :flash
 
     def index
-      @members = Member.all
-      @members = @members.where("login_name ILIKE ?", "%#{search_term}%") unless search_term.nil?
-      @members = @members.order(:login_name).paginate(page: params[:page])
+      @members = Member.order(:login_name)
+      @members = @members.where("login_name ILIKE ?", "%#{search_term}%") if search_term.present?
+      @members = @members.paginate(page: params[:page])
     end
 
     def edit

app/controllers/admin/versions_controller.rb

@@ -9,9 +9,9 @@ module Admin
       @version = PaperTrail::Version.find(params[:id])
       @object = @version.reify
       if @object.save
-        redirect_to admin_crops_path, notice: "Reverted to version from #{@version.created_at.strftime('%B %d, %Y')}"
+        redirect_to admin_crops_path, notice: t('messages.revert_success', date: @version.created_at.strftime('%B %d, %Y'))
       else
-        redirect_to admin_crops_path, alert: "Could not revert to version from #{@version.created_at.strftime('%B %d, %Y')}. Errors: #{@object.errors.full_messages.to_sentence}"
+        redirect_to admin_crops_path, alert: t('messages.revert_error', date: @version.created_at.strftime('%B %d, %Y'), errors: @object.errors.full_messages.to_sentence)
       end
     end
 

app/controllers/alternate_names_controller.rb

@@ -30,7 +30,7 @@ class AlternateNamesController < ApplicationController
     @alternate_name = AlternateName.new(alternate_name_params)
 
     if @alternate_name.save
-      redirect_to @alternate_name.crop, notice: 'Alternate name was successfully created.'
+      redirect_to @alternate_name.crop, notice: t('alternate_names.created')
     else
       render action: "new"
     end
@@ -40,7 +40,7 @@ class AlternateNamesController < ApplicationController
   # PUT /alternate_names/1.json
   def update
     if @alternate_name.update(alternate_name_params)
-      redirect_to @alternate_name.crop, notice: 'Alternate name was successfully updated.'
+      redirect_to @alternate_name.crop, notice: t('alternate_names.updated')
     else
       render action: "edit"
     end
@@ -51,7 +51,7 @@ class AlternateNamesController < ApplicationController
   def destroy
     @crop = @alternate_name.crop
     @alternate_name.destroy
-    redirect_to @crop, notice: 'Alternate name was successfully deleted.'
+    redirect_to @crop, notice: t('alternate_names.deleted')
   end
 
   private

app/controllers/authentications_controller.rb

@@ -24,9 +24,9 @@ class AuthenticationsController < ApplicationController
           name:
         )
 
-      flash[:notice] = "Authentication successful."
+      flash[:notice] = t('messages.auth_success')
     else
-      flash[:notice] = "Authentication failed."
+      flash[:notice] = t('messages.auth_failed')
     end
     redirect_to request.env['omniauth.origin'] || edit_member_registration_path
   end

app/controllers/blocks_controller.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class BlocksController < ApplicationController
+  load_and_authorize_resource
+  skip_load_resource only: :create
+
+  def create
+    @block = current_member.blocks.build(blocked: Member.find(params[:blocked]))
+
+    if @block.save
+      flash[:notice] = "Blocked #{@block.blocked.login_name}"
+    else
+      flash[:error] = "Already blocking or error while blocking."
+    end
+    redirect_back_or_to(root_path)
+  end
+
+  def destroy
+    @block = current_member.blocks.find(params[:id])
+    @unblocked = @block.blocked
+    @block.destroy
+
+    flash[:notice] = "Unblocked #{@unblocked.login_name}"
+    redirect_to @unblocked
+  end
+
+  private
+
+  def block_params
+    params.permit(:id, :blocked)
+  end
+end

app/controllers/crops_controller.rb

@@ -160,7 +160,7 @@ class CropsController < ApplicationController
              when 'youtube'
                Crop.approved.where(en_youtube_url: [nil, '']).order(plantings_count: :desc)
              when 'alternate_names'
-               Crop.approved.left_joins(:alternate_names).where(alternate_names: { id: nil }).order(plantings_count: :desc)
+               Crop.approved.where.missing(:alternate_names).order(plantings_count: :desc)
              when 'wikidata'
                crops_with_wikidata = Crop.joins(:scientific_names).where.not(scientific_names: { wikidata_id: nil }).distinct
                Crop.approved.where.not(id: crops_with_wikidata).order(plantings_count: :desc)
@@ -170,6 +170,8 @@ class CropsController < ApplicationController
                Crop.approved.where(sun_requirements: [nil, '']).order(plantings_count: :desc)
              when 'height'
                Crop.approved.where(height: nil).order(plantings_count: :desc)
+             when 'public_food_key'
+               Crop.approved.where(public_food_key: [nil, '']).order(plantings_count: :desc)
              else
                Crop.none
              end

app/controllers/follows_controller.rb

@@ -13,11 +13,11 @@ class FollowsController < ApplicationController
     @follow = current_member.follows.build(followed: Member.find(params[:followed]))
 
     if @follow.save
-      flash[:notice] = "Followed #{@follow.followed.login_name}"
+      flash[:notice] = t('messages.followed', name: @follow.followed.login_name)
     else
-      flash[:error] = "Already following or error while following."
+      flash[:error] = t('messages.follow_error')
     end
-    redirect_back fallback_location: root_path
+    redirect_back_or_to(root_path)
   end
 
   def destroy
@@ -25,7 +25,7 @@ class FollowsController < ApplicationController
     @unfollowed = @follow.followed
     @follow.destroy
 
-    flash[:notice] = "Unfollowed #{@unfollowed.login_name}"
+    flash[:notice] = t('messages.unfollowed', name: @unfollowed.login_name)
     redirect_to @unfollowed
   end
 

app/controllers/forums_controller.rb

@@ -32,14 +32,14 @@ class ForumsController < ApplicationController
   # POST /forums.json
   def create
     @forum = Forum.new(forum_params)
-    flash[:notice] = 'Forum was successfully created.' if @forum.save
+    flash[:notice] = t('forums.created') if @forum.save
     respond_with(@forum)
   end
 
   # PUT /forums/1
   # PUT /forums/1.json
   def update
-    flash[:notice] = 'Forum was successfully updated.' if @forum.update(forum_params)
+    flash[:notice] = t('forums.updated') if @forum.update(forum_params)
     respond_with(@forum)
   end
 
@@ -47,7 +47,7 @@ class ForumsController < ApplicationController
   # DELETE /forums/1.json
   def destroy
     @forum.destroy
-    flash[:notice] = 'Forum was successfully deleted'
+    flash[:notice] = t('forums.deleted')
     redirect_to forums_url
   end
 

app/controllers/home_controller.rb

@@ -10,4 +10,6 @@ class HomeController < ApplicationController
     # the relevant class methods directly in the view, so that fragment
     # caching will be effective.
   end
+
+  def community_gardens; end
 end

app/controllers/likes_controller.rb

@@ -14,7 +14,7 @@ class LikesController < ApplicationController
       @like.likeable.reindex(refresh: true)
       success(@like, liked_by_member: true, status_code: :created)
     else
-      failed(@like, message: 'Unable to like')
+      failed(@like, message: t('messages.unable_to_like'))
     end
   end
 
@@ -29,7 +29,7 @@ class LikesController < ApplicationController
       @like.likeable.reindex(refresh: true)
       success(@like, liked_by_member: false, status_code: :ok)
     else
-      failed(@like, message: 'Unable to unlike')
+      failed(@like, message: t('messages.unable_to_unlike'))
     end
   end
 

app/controllers/messages_controller.rb

@@ -27,10 +27,21 @@ class MessagesController < ApplicationController
   def create
     if params[:conversation_id].present?
       @conversation = Mailboxer::Conversation.find(params[:conversation_id])
+      # Check if any of the recipients have blocked the sender
+      if @conversation.recipients.any? { |recipient| recipient.already_blocking?(current_member) }
+        flash[:error] = "You cannot reply to this conversation because one of the recipients has blocked you."
+        redirect_to conversation_path(@conversation)
+        return
+      end
       current_member.reply_to_conversation(@conversation, params[:body])
       redirect_to conversation_path(@conversation)
     else
       recipient = Member.find(params[:recipient_id])
+      if recipient.already_blocking?(current_member)
+        flash[:error] = "You cannot send a message to a member who has blocked you."
+        redirect_back_or_to(root_path)
+        return
+      end
       body = params[:body]
       subject = params[:subject]
       @conversation = current_member.send_message(recipient, body, subject)

app/controllers/omniauth_callbacks_controller.rb

@@ -10,7 +10,7 @@ require './lib/actions/oauth_signup_action'
 #
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def failure
-    flash[:alert] = "Authentication failed."
+    flash[:alert] = t('messages.auth_failed')
     redirect_to request.env['omniauth.origin'] || "/"
   end
 

app/controllers/places_controller.rb

@@ -33,7 +33,7 @@ class PlacesController < ApplicationController
 
   def search
     if params[:new_place].empty?
-      redirect_to places_path, alert: 'Please enter a valid location'
+      redirect_to places_path, alert: t('messages.invalid_location')
     else
       redirect_to place_path(params[:new_place])
     end

app/controllers/plantings_controller.rb

@@ -116,11 +116,11 @@ class PlantingsController < DataController
     new_planting.finished_at = nil
 
     if new_planting.save
-      redirect_to edit_planting_path(new_planting), notice: 'Planting was successfully transplanted.'
+      redirect_to edit_planting_path(new_planting), notice: t('messages.transplant_success')
     else
       # if the save fails, we should probably roll back the finishing of the original planting
       @planting.update(finished: false, finished_at: nil)
-      redirect_to @planting, alert: "There was an error transplanting the planting: #{new_planting.errors.full_messages.to_sentence}"
+      redirect_to @planting, alert: t('messages.transplant_error', errors: new_planting.errors.full_messages.to_sentence)
     end
   end
 

app/controllers/posts_controller.rb

@@ -29,17 +29,17 @@ class PostsController < ApplicationController
   def create
     params[:post][:author_id] = current_member.id
     @post = Post.new(post_params)
-    flash[:notice] = 'Post was successfully created.' if @post.save
+    flash[:notice] = t('posts.created') if @post.save
     respond_with(@post)
   end
 
   def update
-    flash[:notice] = 'Post was successfully updated.' if @post.update(post_params)
+    flash[:notice] = t('posts.updated') if @post.update(post_params)
     respond_with(@post)
   end
 
   def destroy
-    flash[:notice] = 'Post was deleted.' if @post.destroy
+    flash[:notice] = t('posts.deleted') if @post.destroy
     respond_with(@post)
   end
 

app/controllers/scientific_names_controller.rb

@@ -54,7 +54,7 @@ class ScientificNamesController < ApplicationController
   def destroy
     @crop = @scientific_name.crop
     @scientific_name.destroy
-    flash[:notice] = 'Scientific name was successfully deleted.'
+    flash[:notice] = t('scientific_names.deleted')
     respond_with(@crop)
   end
 

app/controllers/seeds_controller.rb

@@ -61,7 +61,7 @@ class SeedsController < DataController
     @seed.finished ||= false
     @seed.owner = current_member
     @seed.crop = @seed.parent_planting.crop if @seed.parent_planting
-    flash[:notice] = "Successfully added #{@seed.crop} seed to your stash." if @seed.save
+    flash[:notice] = t('seeds.added_to_stash', crop: @seed.crop) if @seed.save
     if params[:return] == 'planting'
       respond_with(@seed, location: @seed.parent_planting)
     else
@@ -70,7 +70,7 @@ class SeedsController < DataController
   end
 
   def update
-    flash[:notice] = 'Seed was successfully updated.' if @seed.update(seed_params)
+    flash[:notice] = t('seeds.updated') if @seed.update(seed_params)
     respond_with(@seed)
   end
 

app/controllers/sessions_controller.rb

@@ -5,7 +5,7 @@ class SessionsController < Devise::SessionsController
 
   def create
     super do |_resource|
-      flash[:alert] = "There are crops waiting to be wrangled." if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
+      flash[:alert] = t('messages.crops_waiting') if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
     end
   end
 end

app/helpers/crops_helper.rb

@@ -58,7 +58,11 @@ module CropsHelper
         subject_of_entities << {
           '@type': "SocialMediaPosting",
           url:     post_url(post),
-          author:  post.author
+          author:  {
+            '@type': 'Person',
+            name: post.author.login_name
+          },
+          datePublished: post.created_at
         }
       end
 

app/mailers/application_mailer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 class ApplicationMailer < ActionMailer::Base
-  default from: 'from@example.com'
+  default from: "Growstuff <#{Rails.configuration.x.email[:from]}>"
   layout 'mailer'
 end

app/mailers/notifier_mailer.rb

@@ -2,7 +2,7 @@
 
 class NotifierMailer < ApplicationMailer
   # include NotificationsHelper
-  default from: "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"
+  default from: "Growstuff <#{Rails.configuration.x.email[:from]}>"
 
   def verifier
     unless ENV['RAILS_SECRET_TOKEN']

app/models/ability.rb

@@ -164,6 +164,12 @@ class Ability
     can :destroy, Follow
     cannot :destroy, Follow, followed_id: member.id # can't unfollow yourself
 
+    # blocking/unblocking permissions
+    can :create, Block
+    cannot :create, Block, blocked_id: member.id # can't block yourself
+
+    can :destroy, Block, blocker_id: member.id # can only unblock your own blocks
+
     cannot :create, GardenType
     cannot :update, GardenType
     cannot :destroy, GardenType

app/models/australian_food_classification_data.rb

@@ -1,2 +1,8 @@
+# frozen_string_literal: true
+
 class AustralianFoodClassificationData < ApplicationRecord
+  belongs_to :crop,
+             foreign_key: :public_food_key,
+             primary_key: :public_food_key,
+             inverse_of:  :australian_food_classification_data
 end

app/models/block.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Block < ApplicationRecord
+  belongs_to :blocker, class_name: "Member"
+  belongs_to :blocked, class_name: "Member"
+
+  validates :blocker_id, uniqueness: { scope: :blocked_id }
+
+  after_create :destroy_follow_relationship
+
+  private
+
+  def destroy_follow_relationship
+    # Destroy the follow relationship in both directions
+    Follow.where(follower: blocker, followed: blocked).destroy_all
+    Follow.where(follower: blocked, followed: blocker).destroy_all
+  end
+end

app/models/comment.rb

@@ -4,6 +4,7 @@ class Comment < ApplicationRecord
   belongs_to :author, class_name: 'Member', inverse_of: :comments
   belongs_to :commentable, polymorphic: true, counter_cache: true
   # validates :body, presence: true
+  validate :author_is_not_blocked
 
   scope :post_order, -> { order(created_at: :asc) } # for display on post page
 
@@ -25,4 +26,14 @@ class Comment < ApplicationRecord
   def to_s
     "#{author.login_name} commented on #{commentable.subject}"
   end
+
+  private
+
+  def author_is_not_blocked
+    return unless author
+
+    return unless commentable.author.already_blocking?(author)
+
+    errors.add(:base, "You cannot comment on a post of a member who has blocked you.")
+  end
 end

app/models/concerns/search_harvests.rb

@@ -53,7 +53,9 @@ module SearchHarvests
       owners = []
       1..limit.times do
         where = {
-          photos_count: { gt: 0 },
+          # Disabled for now so that more relevant harvests are
+          # surfaced; even if we're falling back to crop photos.
+          # photos_count: { gt: 0 },
           owner_id:     { not: owners }
         }
         one_record = search('*',

app/models/concerns/search_plantings.rb

@@ -66,7 +66,9 @@ module SearchPlantings
       owners = []
       1..limit.times do
         where = {
-          photos_count: { gt: 0 },
+          # Disabled for now so that more relevant plantings are
+          # surfaced; even if we're falling back to crop photos.
+          # photos_count: { gt: 0 },
           owner_id:     { not: owners }
         }
         one_record = search('*',

app/models/crop.rb

@@ -28,6 +28,10 @@ class Crop < ApplicationRecord
   has_many :companions, through: :crop_companions, source: :crop_b, class_name: 'Crop'
   has_many :crop_posts, dependent: :delete_all
   has_many :posts, through: :crop_posts, dependent: :delete_all
+  has_one :australian_food_classification_data,
+          foreign_key: :public_food_key,
+          primary_key: :public_food_key,
+          inverse_of:  :crop
 
   accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
 
@@ -53,13 +57,13 @@ class Crop < ApplicationRecord
   validates :en_wikipedia_url,
             format: {
               with:    %r{\Ahttps?://en\.wikipedia\.org/wiki/[[:alnum:]%_.()-]+\z},
-              message: 'is not a valid English Wikipedia URL'
+              message: :not_a_valid_wikipedia_url
             },
             if:     :approved?
   validates :en_youtube_url,
             format: {
               with:    %r{\A(?:https?://)?(?:www\.)?(?:youtube(?:-nocookie)?\.com/(?:(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)[a-zA-Z0-9_-]{11}(?:[?&]\S*)?\z},
-              message: 'is not a valid YouTube URL'
+              message: :not_a_valid_youtube_url
             },
             allow_blank: true
   validates :name, uniqueness: { scope: :approval_status }, if: :pending?
@@ -186,12 +190,12 @@ class Crop < ApplicationRecord
     return if rejected?
     return unless reason_for_rejection.present? || rejection_notes.present?
 
-    errors.add(:approval_status, "must be rejected if a reason for rejection is present")
+    errors.add(:approval_status, :rejection_reason_required)
   end
 
   def must_have_meaningful_reason_for_rejection
     return unless reason_for_rejection == "other" && rejection_notes.blank?
 
-    errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
+    errors.add(:rejection_notes, :rejection_notes_required)
   end
 end

app/models/follow.rb

@@ -4,6 +4,7 @@ class Follow < ApplicationRecord
   belongs_to :follower, class_name: "Member", inverse_of: :follows
   belongs_to :followed, class_name: "Member", inverse_of: :inverse_follows
   validates :follower_id, uniqueness: { scope: :followed_id }
+  validate :follower_is_not_blocked
 
   after_create do
     Notification.create(
@@ -14,4 +15,14 @@ class Follow < ApplicationRecord
       notifiable:   self
     )
   end
+
+  private
+
+  def follower_is_not_blocked
+    return unless follower
+
+    return unless followed.already_blocking?(follower)
+
+    errors.add(:base, "You cannot follow a member who has blocked you.")
+  end
 end

app/models/garden.rb

@@ -32,7 +32,7 @@ class Garden < ApplicationRecord
 
   validates :name, uniqueness: { scope: :owner_id }
   validates :name,
-            format: { without: /\n/, message: "must contain no newlines" },
+            format: { without: /\n/, message: :no_newlines },
             allow_blank: false, presence: true,
             length: { maximum: 255 }
 
@@ -53,7 +53,7 @@ class Garden < ApplicationRecord
     "acres"         => "acre"
   }.freeze
   validates :area_unit, inclusion:   { in:      AREA_UNITS_VALUES.values,
-                                       message: "%<value>s is not a valid area unit" },
+                                       message: :not_a_valid_area_unit },
                         allow_blank: true
 
   def cleanup_area

app/models/garden_collaborator.rb

@@ -11,7 +11,7 @@ class GardenCollaborator < ApplicationRecord
     return unless member
     return unless garden
 
-    errors.add(:member_id, "cannot be the garden owner") if garden.owner == member
+    errors.add(:member_id, :cannot_be_garden_owner) if garden.owner == member
   end
 
   def member_slug

app/models/harvest.rb

@@ -58,18 +58,18 @@ class Harvest < ApplicationRecord
   ##
   ## Validations
   validates :crop, approved: true
-  validates :crop, presence: { message: "must be present and exist in our database" }
-  validates :plant_part, presence: { message: "must be present and exist in our database" }
+  validates :crop, presence: { message: :crop_not_found }
+  validates :plant_part, presence: { message: :crop_not_found }
   validates :harvested_at, presence: true
   validates :quantity, allow_nil: true, numericality: {
     only_integer: false, greater_than_or_equal_to: 0
   }
   validates :unit, allow_blank: true, inclusion: {
-    in: UNITS_VALUES.values, message: "%<value>s is not a valid unit"
+    in: UNITS_VALUES.values, message: :not_a_valid_unit
   }
   validates :weight_quantity, allow_nil: true, numericality: { only_integer: false }
   validates :weight_unit, allow_blank: true, inclusion: {
-    in: WEIGHT_UNITS_VALUES.values, message: "%<value>s is not a valid unit"
+    in: WEIGHT_UNITS_VALUES.values, message: :not_a_valid_unit
   }
   validate :crop_must_match_planting
   validate :owner_must_match_planting
@@ -147,7 +147,7 @@ class Harvest < ApplicationRecord
   def crop_must_match_planting
     return if planting.blank? # only check if we are linked to a planting
 
-    errors.add(:planting, "must be the same crop") unless crop == planting.crop
+    errors.add(:planting, :same_crop_required) unless crop == planting.crop
   end
 
   def owner_must_match_planting
@@ -155,14 +155,13 @@ class Harvest < ApplicationRecord
 
     return if owner == planting.owner || planting.garden.garden_collaborators.where(member_id: owner).any?
 
-    errors.add(:owner,
-               "of harvest must be the same as planting, or a collaborator on that garden")
+    errors.add(:owner, :same_owner_required)
   end
 
   def harvest_must_be_after_planting
     # only check if we are linked to a planting
     return unless harvested_at.present? && planting.present? && planting.planted_at.present?
 
-    errors.add(:planting, "cannot be harvested before planting") unless harvested_at > planting.planted_at
+    errors.add(:planting, :harvest_after_planted) unless harvested_at > planting.planted_at
   end
 end

app/models/like.rb

@@ -5,4 +5,24 @@ class Like < ApplicationRecord
   belongs_to :likeable, polymorphic: true, counter_cache: true, touch: true
   validates :member, :likeable, presence: true
   validates :member, uniqueness: { scope: :likeable }
+  validate :member_is_not_blocked
+
+  def likeable_author
+    if likeable.respond_to?(:author)
+      likeable.author
+    elsif likeable.respond_to?(:owner)
+      likeable.owner
+    end
+  end
+
+  private
+
+  def member_is_not_blocked
+    return unless member
+
+    author = likeable_author
+    return unless author&.already_blocking?(member)
+
+    errors.add(:base, "You cannot like content of a member who has blocked you.")
+  end
 end

app/models/member.rb

@@ -52,6 +52,15 @@ class Member < ApplicationRecord
   has_many :followed, through: :follows
   has_many :followers, through: :inverse_follows, source: :follower
 
+  #
+  # Blocking other members
+  has_many :blocks, class_name: "Block", foreign_key: "blocker_id", dependent: :destroy,
+                    inverse_of: :blocker
+  has_many :inverse_blocks, class_name: "Block", foreign_key: "blocked_id",
+                            dependent: :destroy, inverse_of: :blocked
+  has_many :blocked_members, through: :blocks, source: :blocked
+  has_many :blockers, through: :inverse_blocks, source: :blocker
+
   #
   # Global data records this member created
   has_many :requested_crops, class_name: 'Crop', foreign_key: 'requester_id', dependent: :nullify,
@@ -96,21 +105,21 @@ class Member < ApplicationRecord
   validates :tos_agreement, acceptance: { allow_nil: true, accept: true }
   validates :login_name,
             length:     {
-              minimum: 2, maximum: 25, message: "should be between 2 and 25 characters long"
+              minimum: 2, maximum: 25, message: :login_name_length
             },
             exclusion:  {
-              in: %w(growstuff admin moderator staff nearby), message: "name is reserved"
+              in: %w(growstuff admin moderator staff nearby), message: :login_name_reserved
             },
             format:     {
-              with: /\A\w+\z/, message: "may only include letters, numbers, or underscores"
+              with: /\A\w+\z/, message: :login_name_format
             },
             uniqueness: {
               case_sensitive: false
             }
-  validates :website_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
-  validates :other_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
+  validates :website_url, format: { with: %r{\Ahttps?://}, message: :url_format }, allow_blank: true
+  validates :other_url, format: { with: %r{\Ahttps?://}, message: :url_format }, allow_blank: true
   validates :instagram_handle, :facebook_handle, :bluesky_handle,
-            format: { without: %r{\Ahttps?://|/}, message: "should be a handle, not a URL" }, allow_blank: true
+            format: { without: %r{\Ahttps?://|/}, message: :handle_format }, allow_blank: true
 
   #
   # Triggers
@@ -164,12 +173,12 @@ class Member < ApplicationRecord
   end
 
   def self.nearest_to(place)
-    nearby_members = []
-    if place
-      latitude, longitude = Geocoder.coordinates(place, params: { limit: 1 })
-      nearby_members = Member.located.sort_by { |x| x.distance_from([latitude, longitude]) } if latitude && longitude
-    end
-    nearby_members
+    return [] if place.blank?
+
+    latitude, longitude = Geocoder.coordinates(place, params: { limit: 1 })
+    return [] unless latitude && longitude
+
+    Member.located.near([latitude, longitude], 1000)
   end
 
   def already_following?(member)
@@ -179,4 +188,12 @@ class Member < ApplicationRecord
   def get_follow(member)
     follows.find_by(followed_id: member.id) if already_following?(member)
   end
+
+  def already_blocking?(member)
+    blocks.exists?(blocked_id: member.id)
+  end
+
+  def get_block(member)
+    blocks.find_by(blocked_id: member.id) if already_blocking?(member)
+  end
 end

app/models/photo_association.rb

@@ -29,12 +29,12 @@ class PhotoAssociation < ApplicationRecord
   def photo_and_item_have_same_owner
     return if photographable_type == 'Crop'
 
-    errors.add(:photo, "must have same owner as item it links to") unless photographable.owner_id == photo.owner_id
+    errors.add(:photo, :photo_owner_mismatch) unless photographable.owner_id == photo.owner_id
   end
 
   def crop_present
     return unless %w(Planting Seed Harvest).include?(photographable_type)
 
-    errors.add(:crop_id, "failed to calculate crop") if crop_id.blank?
+    errors.add(:crop_id, :calculate_crop_failed) if crop_id.blank?
   end
 end

app/models/planting.rb

@@ -72,7 +72,7 @@ class Planting < ApplicationRecord
   ##
   ## Validations
   validates :garden, presence: true
-  validates :crop, presence: true, approved: { message: "must be present and exist in our database" }
+  validates :crop, presence: true, approved: { message: :crop_must_be_approved }
   validate :finished_must_be_after_planted
   validate :owner_must_match_garden_owner
   validate :cannot_be_finished_and_failed
@@ -80,10 +80,10 @@ class Planting < ApplicationRecord
     only_integer: true, greater_than_or_equal_to: 0
   }
   validates :sunniness, allow_blank: true, inclusion: {
-    in: SUNNINESS_VALUES, message: "%<value>s is not a valid sunniness value"
+    in: SUNNINESS_VALUES, message: :not_a_valid_sunniness
   }
   validates :planted_from, allow_blank: true, inclusion: {
-    in: PLANTED_FROM_VALUES, message: "%<value>s is not a valid planting method"
+    in: PLANTED_FROM_VALUES, message: :not_a_valid_planting_method
   }
   validates :overall_rating, allow_blank: true, numericality: {
     only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 5
@@ -132,20 +132,19 @@ class Planting < ApplicationRecord
   private
 
   def cannot_be_finished_and_failed
-    errors.add(:failed, "can't be true if planting is also finished") if finished && failed
+    errors.add(:failed, :failed_and_finished) if finished && failed
   end
 
   # check that any finished_at date occurs after planted_at
   def finished_must_be_after_planted
     return unless planted_at && finished_at # only check if we have both
 
-    errors.add(:finished_at, "must be after the planting date") unless planted_at < finished_at
+    errors.add(:finished_at, :finished_after_planted) unless planted_at < finished_at
   end
 
   def owner_must_match_garden_owner
     return if owner == garden.owner || garden.garden_collaborators.where(member_id: owner).any?
 
-    errors.add(:owner,
-               "must be the same as garden, or a collaborator on that garden")
+    errors.add(:owner, :same_owner_required)
   end
 end

app/models/post.rb

@@ -49,9 +49,10 @@ class Post < ApplicationRecord
 
   # return posts sorted by recent activity
   def self.recently_active
-    Post.order(created_at: :desc).sort do |a, b|
-      b.recent_activity <=> a.recent_activity
-    end
+    left_joins(:comments)
+      .select('posts.*, COALESCE(MAX(comments.created_at), posts.created_at) AS last_activity_at')
+      .group('posts.id')
+      .order(Arel.sql('last_activity_at DESC'))
   end
 
   def owner_id

app/models/seed.rb

@@ -28,7 +28,7 @@ class Seed < ApplicationRecord
   #
   # Validations
   validates :crop, approved: true
-  validates :crop, presence: { message: "must be present and exist in our database" }
+  validates :crop, presence: { message: :crop_not_found }
   validates :quantity, allow_nil:    true,
                        numericality: { only_integer: true, greater_than_or_equal_to: 0 }
   validates :days_until_maturity_min, allow_nil:    true,
@@ -36,20 +36,15 @@ class Seed < ApplicationRecord
   validates :days_until_maturity_max, allow_nil:    true,
                                       numericality: { only_integer: true, greater_than_or_equal_to: 0 }
   validates :tradable_to, allow_blank: false,
-                          inclusion:   { in: TRADABLE_TO_VALUES, message: "You may only trade seed nowhere, " \
-                                                                          "locally, nationally, or internationally" }
+                          inclusion:   { in: TRADABLE_TO_VALUES, message: :tradable_to_inclusion }
   validates :organic, allow_blank: false,
-                      inclusion:   { in: ORGANIC_VALUES, message: "You must say whether the seeds " \
-                                                                  "are organic or not, or that you don't know" }
+                      inclusion:   { in: ORGANIC_VALUES, message: :organic_inclusion }
   validates :gmo, allow_blank: false,
-                  inclusion:   { in: GMO_VALUES, message: "You must say whether the seeds are " \
-                                                          "genetically modified or not, or that you don't know" }
+                  inclusion:   { in: GMO_VALUES, message: :gmo_inclusion }
   validates :heirloom, allow_blank: false,
-                       inclusion:   { in: HEIRLOOM_VALUES, message: "You must say whether the seeds" \
-                                                                    "are heirloom, hybrid, or unknown" }
+                       inclusion:   { in: HEIRLOOM_VALUES, message: :heirloom_inclusion }
   validates :source, allow_blank: true,
-                     inclusion:   { in: SOURCE_VALUES, message: "You must say where the seeds are from," \
-                                                                "or that you don't know" }
+                     inclusion:   { in: SOURCE_VALUES, message: :source_inclusion }
 
   #
   # Delegations

app/services/gbif_service.rb

@@ -85,7 +85,7 @@ class GbifService
   end
 
   def import!
-    Crop.order(updated_at: :desc).each do |crop|
+    Crop.order(updated_at: :desc).find_each do |crop|
       Rails.logger.debug { "#{crop.id}, #{crop.name}" }
       update_crop(crop) if crop.valid?
     rescue ActiveRecord::RecordInvalid

app/views/alternate_names/_form.html.haml

@@ -16,7 +16,7 @@
       %p
         %span.help-block
           For detailed crop wrangling guidelines, please consult the
-          = link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
+          = link_to "crop wrangling guide", "https://github.com/Growstuff/growstuff/wiki/Crop-Wrangling"
           on the Growstuff wiki.
 
       .form-group

app/views/comments/index.html.haml

@@ -0,0 +1,13 @@
+- content_for :title, "Comments"
+- content_for :meta_description, "Browse and search for comments."
+- content_for :breadcrumbs do
+  %li.breadcrumb-item.active= link_to "Comments", comments_path
+
+%h1 Comments
+
+= will_paginate @comments
+
+- @comments.each do |comment|
+  = render 'single', comment: comment
+
+= will_paginate @comments

app/views/crops/_actions.html.haml

@@ -1,6 +1,9 @@
 - if crop.approved? && signed_in?
+  - active_plantings = current_member.plantings.where(crop: crop).active
 
   .btn-group.crop-actions{"aria-label" => "Crop Actions", role: "group"}
     = render 'plantings/modal', planting: Planting.new(crop: crop, owner: current_member)
     = render 'harvests/modal', harvest: Harvest.new(crop: @crop,  owner: current_member)
     = render 'seeds/modal', seed: Seed.new(crop: @crop,  owner: current_member)
+    - if active_plantings.any?
+      = render 'plantings/failed_modal', crop: crop, active_plantings: active_plantings

app/views/crops/_nutritional_data.html.haml

@@ -0,0 +1,38 @@
+- data = crop.australian_food_classification_data
+- if data
+  .card
+    .card-body
+      %h4.card-title Nutritional Data
+      %p.card-text A summary of nutritional data per 100g for #{data.food_name}.
+      %table.table.table-sm.table-borderless
+        %tbody
+          - if data.energy_with_dietary_fibre_equated_kj.to_f > 0
+            %tr
+              %th Energy
+              %td= "#{data.energy_with_dietary_fibre_equated_kj.to_f.round(1)} kJ"
+          - if data.protein_g.to_f > 0
+            %tr
+              %th Protein
+              %td= "#{data.protein_g.to_f.round(1)} g"
+          - if data.fat_total_g.to_f > 0
+            %tr
+              %th Fat, total
+              %td= "#{data.fat_total_g.to_f.round(1)} g"
+          - if data.available_carbohydrate_with_sugar_alcohols_g.to_f > 0
+            %tr
+              %th Carbohydrate
+              %td= "#{data.available_carbohydrate_with_sugar_alcohols_g.to_f.round(1)} g"
+          - if data.total_sugars_g.to_f > 0
+            %tr
+              %th - Sugars
+              %td= "#{data.total_sugars_g.to_f.round(1)} g"
+          - if data.total_dietary_fibre_g.to_f > 0
+            %tr
+              %th Fibre
+              %td= "#{data.total_dietary_fibre_g.to_f.round(1)} g"
+          - if data.sodium_na_mg.to_f > 0
+            %tr
+              %th Sodium
+              %td= "#{data.sodium_na_mg.to_f.round(1)} mg"
+    .card-footer
+      = link_to "See more", "https://www.foodstandards.gov.au/science-data/food-nutrient-databases/afcd/search/food/#{data.public_food_key}", target: "_blank", rel: "noopener noreferrer"

app/views/crops/_plantings.html.haml

@@ -8,6 +8,8 @@
           = link_to planting_path(planting), class: 'card-link' do
             = planting_icon
             = planting
+          - if can?(:edit, planting)
+            .float-right= render 'plantings/actions', planting: planting
           .float-right= render 'members/location', member: planting.owner
   .card-footer
     - if crop.approved?

app/views/crops/data_improvement.html.haml

@@ -1,10 +1,10 @@
 %h1 Data Improvement
 
-- tabs = { photos: "Photos", descriptions: "Descriptions", youtube: "YouTube videos", alternate_names: "Alternate names", wikidata: "Wikidata ID", row_spacing: "Row spacing", sun_requirements: "Sun requirements", height: "Height" }
+- tabs = { photos: "Photos", descriptions: "Descriptions", youtube: "YouTube videos", alternate_names: "Alternate names", wikidata: "Wikidata ID", public_food_key: "Public Food Key", row_spacing: "Row spacing", sun_requirements: "Sun requirements", height: "Height" }
 
 %ul.nav.nav-tabs
   - tabs.each do |key, value|
-    %li{class: ('active' if @active_tab == key.to_s)}
+    %li{class: "nav-item #{('active' if @active_tab == key.to_s)}"}
       = link_to value, data_improvement_crops_path(tab: key)
 
 .tab-content

app/views/crops/index.html.haml

@@ -1,4 +1,5 @@
 - content_for :title, t('.title')
+- content_for :meta_description, "Browse and search for crops."
 
 - content_for :buttonbar do
   - if can? :wrangle, Crop

app/views/crops/show.html.haml

@@ -1,5 +1,13 @@
 = render 'schema_org', crop: @crop
-- content_for :title, @crop.name
+- content_for :title do
+  = @crop.name.titleize
+  - if @crop.default_scientific_name.present?
+    = " (#{@crop.default_scientific_name})"
+- content_for :meta_description do
+  - if @crop.description.present?
+    = @crop.description
+  - else
+    = "Learn how to grow #{@crop.name}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: crop_image_path(@crop))
   = tag("meta", property: "og:title", content: @crop.name)
@@ -128,6 +136,8 @@
 
     = render 'openfarm_data', crop: @crop
 
+    = render 'nutritional_data', crop: @crop
+
     = cute_icon
     .card
       .card-body

app/views/forums/index.html.haml

@@ -6,6 +6,7 @@
 
 - @forums.each do |forum|
   %h2= forum
+  %p= forum.description
   %p
     = localize_plural(forum.posts, Post)
     |

app/views/harvests/index.html.haml

@@ -1,5 +1,6 @@
 - content_for(:title) do
   = title('harvests', @owner, @crop, @planting)
+- content_for :meta_description, "Browse and search for harvests."
 - content_for :breadcrumbs do
   - if @owner
     %li.breadcrumb-item= link_to 'Harvests', harvests_path

app/views/harvests/show.html.haml

@@ -1,4 +1,9 @@
 = content_for :title, "#{@harvest.crop} harvested by #{@harvest.owner}"
+- content_for :meta_description do
+  - if @harvest.description.present?
+    = @harvest.description
+  - else
+    = "#{@harvest.crop} harvested by #{@harvest.owner}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: harvest_image_path(@harvest))
   = tag("meta", property: "og:image:user_generated", content: "true")
@@ -71,3 +76,4 @@
 
     .col-md-4.col-xs-12
       = render @harvest.crop
+      = render 'crops/nutritional_data', crop: @harvest.crop

app/views/home/_harvests.html.haml

@@ -9,4 +9,5 @@
           %small.text-muted
             harvested by #{harvest.owner_login_name}
         %p.mb-2
-          = image_tag harvest.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{harvest.crop_name} by #{harvest.owner}"
+          - if harvest.thumbnail_url
+            = image_tag harvest.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{harvest.crop_name} by #{harvest.owner}"

app/views/home/community_gardens.html.haml

@@ -0,0 +1,37 @@
+- content_for :title do
+  = t('community_gardens.title')
+- content_for :meta_description do
+  = t('community_gardens.meta_description')
+
+
+
+.container.mt-5
+
+  .row
+    .col-lg-6.col-sm-12
+      .row
+        %h1.display-4= t('community_gardens.header')
+        %p.lead= t('community_gardens.lead')
+      .row
+        %h2= t('community_gardens.features_title')
+        %ul
+          %li Track all your plantings and harvests
+          %li Keep notes your community's progress
+          %li Add collaborators to your garden plots
+          %li See what other community gardens are growing
+          %li Get advice and support from our community of gardeners
+
+      .row
+        %h2= t('community_gardens.get_started')
+        %p= t('community_gardens.get_started_text')
+        %p
+          = link_to t('.sign_up'), new_member_registration_path, class: 'btn btn-success btn-lg'
+      .row
+        %h2= t('community_gardens.collaborate')
+        %p= t('community_gardens.collaborate_text')
+        %p
+          = link_to t('community_gardens.learn_more'), gardens_path, class: 'btn btn-info btn-lg'
+
+    .col-lg-6.d-lg-block.d-xs-none
+      .container
+        =image_tag("girlwithvegetables-0038331hotifw.svg", width: "100%")

app/views/home/index.html.haml

@@ -1,5 +1,7 @@
 - content_for :title do
   = ENV['GROWSTUFF_SITE_NAME']
+- content_for :meta_description do
+  Growstuff is a community of food gardeners. Let's learn to grow food together.
 
 - if member_signed_in?
   .row

app/views/layouts/_head.html.haml

@@ -27,9 +27,14 @@
 
   %title
     = content_for?(:title) ? yield(:title) + " - #{ENV['GROWSTUFF_SITE_NAME']} " : ENV['GROWSTUFF_SITE_NAME']
+  - if content_for?(:meta_description)
+    %meta{name: "description", content: yield(:meta_description)}
+  - else
+    %meta{name: "description", content: "Growstuff is a community of food gardeners. Let's learn to grow food together. All our data is open data."}
   = csrf_meta_tags
   = stylesheet_link_tag "application", media: "all"
 
   %link{ href: path_to_image("growstuff-apple-touch-icon-precomposed.png"), rel: "apple-touch-icon-precomposed" }
   %link{ href: "https://fonts.googleapis.com/css?family=Modak|Raleway&display=swap", rel: "stylesheet" }
   = favicon_link_tag 'favicon.ico'
+  = tag("meta", name: "google-site-verification", content: "j249rPGdBqZ7gcShcdsSXCnGN5lqCuTISJnlQXxOfu4")

app/views/layouts/_menu.haml

@@ -52,6 +52,7 @@
         .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
           = link_to t('.community_map'), places_path, class: 'dropdown-item'
           = link_to t('.browse_members'), members_path, class: 'dropdown-item'
+          = link_to t('.community_gardens'), community_gardens_path, class: 'dropdown-item'
           = link_to t('.posts'), posts_path, class: 'dropdown-item'
           = link_to t('.forums'), forums_path, class: 'dropdown-item'
 

app/views/members/_follow_buttons.haml

@@ -1,6 +1,11 @@
 - if current_member && current_member != member # must be logged in, can't follow yourself
+  - block = current_member.get_block(member)
   - follow = current_member.get_follow(member)
-  - if !follow && can?(:create, Follow) # not already following
+  - if !block && !follow && can?(:create, Follow) # not already following, and not blocking
     = link_to 'Follow', follows_path(followed: member), method: :post, class: 'btn btn-block btn-success'
   - if follow && can?(:destroy, follow) # already following
-    = link_to 'Unfollow', follow_path(follow), method: :delete, class: 'btn btn-block'
+    = link_to 'Unfollow', follow_path(follow), method: :delete, class: 'btn btn-block'
+  - if !block && can?(:create, Block) # not already blocking
+    = link_to 'Block', blocks_path(blocked: member), method: :post, class: 'btn btn-block btn-danger'
+  - if block && can?(:destroy, block) # already blocking
+    = link_to 'Unblock', block_path(block), method: :delete, class: 'btn btn-block'

app/views/members/show.html.haml

@@ -1,4 +1,9 @@
 - content_for :title, @member.login_name
+- content_for :meta_description do
+  - if @member.bio.present?
+    = @member.bio
+  - else
+    = "Gardening profile for #{@member.login_name}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: avatar_uri(@member, 200))
   = tag("meta", property: "og:image:user_generated", content: "true")

app/views/plantings/_failed_modal.html.haml

@@ -0,0 +1,26 @@
+#modelFailedPlantingForm.modal.fade{"aria-hidden" => "true", "aria-labelledby" => "failed-planting-button", role: "dialog", tabindex: "-1"}
+  .modal-dialog{role: "document"}
+    .modal-content
+      .modal-header.text-center
+        %h4.modal-title.w-100.font-weight-bold Mark #{crop.name} planting as failed
+        %button.close{"aria-label" => "Close", "data-bs-dismiss" => "modal", type: "button"}
+          %span{"aria-hidden" => "true"} ×
+      .modal-body
+        %p Which planting would you like to mark as failed?
+
+        %ul.list-group
+          - active_plantings.each do |planting|
+            %li.list-group-item
+              = link_to planting_path(planting, planting: {failed: 1}), method: :put do
+                .d-flex.justify-content-between
+                  %span
+                    %h4= planting.garden.name
+                    %p Planted #{planting.planted_at}
+                  %span
+                    = finished_icon
+        .mt-3.text-right
+          = link_to 'cancel', '', "data-bs-dismiss" => "modal", class: 'btn btn-secondary'
+
+%a.btn#failed-planting-button{"data-bs-target" => "#modelFailedPlantingForm", "data-bs-toggle" => "modal", href: ""}
+  = finished_icon
+  Mark as failed

app/views/plantings/index.html.haml

@@ -1,4 +1,5 @@
 - content_for :title, title('plantings', @owner, @crop, @planting)
+- content_for :meta_description, "Browse and search for plantings."
 
 - content_for :breadcrumbs do
   - if @owner

app/views/plantings/show.html.haml

@@ -1,4 +1,9 @@
 = content_for :title, "#{@planting.crop} in #{@planting.location}"
+- content_for :meta_description do
+  - if @planting.description.present?
+    = @planting.description
+  - else
+    = "#{@planting.crop} planted in #{@planting.location} by #{@planting.owner}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: planting_image_path(@planting))
   = tag("meta", property: "og:title", content: "#{@planting.crop} in #{@planting.location}")

app/views/scientific_names/_form.html.haml

@@ -11,7 +11,7 @@
   %p
     %span.help-block
       For detailed crop wrangling guidelines, please consult the
-      = link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
+      = link_to "crop wrangling guide", "https://github.com/Growstuff/growstuff/wiki/Crop-Wrangling"
       on the Growstuff wiki.
 
   .form-group
@@ -27,7 +27,7 @@
   .form-group
     = f.label :wikidata_id, "Wikidata ID", class: 'control-label col-md-2'
     .col-md-8
-      = f.text_field :wikidata_id, class: 'form-control'
+      = f.text_field :wikidata_id, class: 'form-control', pattern: 'Q[1-9][0-9]*'
   .form-group
     .form-actions.col-md-offset-2.col-md-8
       = f.submit 'Save', class: 'btn btn-primary'

app/views/seeds/index.html.haml

@@ -6,6 +6,7 @@
     %li.breadcrumb-item.active= link_to 'Seeds', seeds_path
 
 - content_for :title, title('seeds', @owner, @crop, @planting)
+- content_for :meta_description, "Browse and search for seeds."
 
 .row
   .col-md-2

app/views/seeds/show.html.haml

@@ -1,4 +1,9 @@
 - content_for :title, "#{@seed.owner}'s #{@seed.crop} seeds"
+- content_for :meta_description do
+  - if @seed.description.present?
+    = @seed.description
+  - else
+    = "Seeds for #{@seed.crop.name}, shared by #{@seed.owner}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: seed_image_path(@seed))
   - if @seed.description

config.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-# Require any additional compass plugins here.
-# Set this to the root of your project when deployed:
-http_path = "/"
-css_dir = "app/assets/stylesheets"
-sass_dir = "app/assets/stylesheets"
-javascripts_dir = "app/assets/javascripts"
-images_dir      = "app/assets/images"
-
-# You can select your preferred output style here (can be overridden via the command line):
-# output_style = :expanded or :nested or :compact or :compressed
-
-# To enable relative paths to assets via compass helper functions. Uncomment:
-# relative_assets = true
-
-# To disable debugging comments that display the original location of your selectors. Uncomment:
-# line_comments = false
-
-# If you prefer the indented syntax, you might want to regenerate this
-# project again passing --syntax sass, or you can uncomment this:
-preferred_syntax = :sass
-# and then run:
-# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass

config.ru

@@ -3,4 +3,6 @@
 # This file is used by Rack-based servers to start the application.
 
 require File.expand_path('config/environment', __dir__)
+
+use Rack::Deflater
 run Rails.application

config/application.rb

@@ -62,9 +62,9 @@ module Growstuff
 
     # Growstuff-specific configuration variables
     config.currency = 'AUD'
-    config.bot_email = ENV.fetch('GROWSTUFF_EMAIL', nil)
+    config.bot_email = Rails.configuration.x.email[:from]
     config.user_agent = 'Growstuff'
-    config.user_agent_email = "info@growstuff.org"
+    config.user_agent_email = Rails.configuration.x.email[:from]
 
     Gibbon::API.api_key = ENV['GROWSTUFF_MAILCHIMP_APIKEY'] || 'notarealkey'
     # API key can't be blank or tests fail

config/compass.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-# Require any additional compass plugins here.
-project_type = :rails

config/initializers/devise.rb

@@ -6,7 +6,7 @@ Devise.setup do |config|
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"
+  config.mailer_sender = "Growstuff <#{Rails.configuration.x.email[:from]}>"
 
   config.secret_key = ENV.fetch('RAILS_SECRET_TOKEN', nil)
 

config/initializers/email.rb

@@ -0,0 +1,9 @@
+module Growstuff
+  class Application < Rails::Application
+    config.x.email = {
+      from: ENV.fetch('GROWSTUFF_EMAIL', 'info@growstuff.org'),
+      admin: ENV.fetch('GROWSTUFF_ADMIN_EMAIL', 'sysadmin@growstuff.org'),
+      support: ENV.fetch('GROWSTUFF_SUPPORT_EMAIL', 'info@growstuff.org')
+    }
+  end
+end

config/initializers/new_framework_defaults_6_0.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 #
 # This file contains migration options to ease your Rails 6.0 upgrade.

config/locales/en.yml

@@ -63,6 +63,56 @@ en:
       seed:
         one: seed
         other: seeds
+    errors:
+      messages:
+        crop_not_found: must be present and exist in our database
+        crop_must_be_approved: must be present and exist in our database
+        failed_and_finished: "can't be true if planting is also finished"
+        finished_after_planted: must be after the planting date
+        rejection_reason_required: must be rejected if a reason for rejection is present
+        rejection_notes_required: "must be added if the reason for rejection is \"other\""
+        same_crop_required: must be the same crop
+        harvest_after_planted: cannot be harvested before planting
+        cannot_be_garden_owner: cannot be the garden owner
+        same_owner_required: "of harvest must be the same as planting, or a collaborator on that garden"
+        photo_owner_mismatch: must have same owner as item it links to
+        calculate_crop_failed: failed to calculate crop
+        not_a_valid_wikipedia_url: is not a valid English Wikipedia URL
+        not_a_valid_youtube_url: is not a valid YouTube URL
+        not_a_valid_sunniness: "%{value} is not a valid sunniness value"
+        not_a_valid_planting_method: "%{value} is not a valid planting method"
+        not_a_valid_unit: "%{value} is not a valid unit"
+        not_a_valid_area_unit: "%{value} is not a valid area unit"
+        no_newlines: must contain no newlines
+      models:
+        member:
+          attributes:
+            login_name:
+              login_name_length: should be between 2 and 25 characters long
+              login_name_reserved: name is reserved
+              login_name_format: may only include letters, numbers, or underscores
+            website_url:
+              url_format: "must start with http:// or https://"
+            other_url:
+              url_format: "must start with http:// or https://"
+            instagram_handle:
+              handle_format: should be a handle, not a URL
+            facebook_handle:
+              handle_format: should be a handle, not a URL
+            bluesky_handle:
+              handle_format: should be a handle, not a URL
+        seed:
+          attributes:
+            tradable_to:
+              tradable_to_inclusion: "You may only trade seed nowhere, locally, nationally, or internationally"
+            organic:
+              organic_inclusion: "You must say whether the seeds are organic or not, or that you don't know"
+            gmo:
+              gmo_inclusion: "You must say whether the seeds are genetically modified or not, or that you don't know"
+            heirloom:
+              heirloom_inclusion: "You must say whether the seeds are heirloom, hybrid, or unknown"
+            source:
+              source_inclusion: "You must say where the seeds are from, or that you don't know"
   application_helper:
     title:
       title:
@@ -112,6 +162,9 @@ en:
   forums:
     index:
       title: Forums
+    created: Forum was successfully created.
+    updated: Forum was successfully updated.
+    deleted: Forum was successfully deleted.
   gardens:
     created: Garden was successfully created.
     deleted: Garden was successfully deleted.
@@ -208,6 +261,8 @@ en:
       trade_to: Will trade to
       unspecified: unspecified
       view_all: View all seeds
+    added_to_stash: Successfully added %{crop} seed to your stash.
+    updated: Seed was successfully updated.
     stats:
       member_linktext: "%{count} members"
       message_html: So far, %{member} have planted %{number_crops} %{number_plantings} in %{number_gardens}; and %{contributors} people have contributed to our code on %{github}!
@@ -219,6 +274,18 @@ en:
     pwa_ios_steps_html: 1. Tap the <strong>Share</strong> button in Safari.<br>2. Scroll down and tap <strong>Add to Home Screen</strong>'.
     pwa_ios_title: For iOS (iPhone/iPad)
     pwa_title: Want to install Growstuff on your phone?
+  community_gardens:
+    title: Community Gardens on Growstuff
+    meta_description: Manage your community garden, track your plantings, and collaborate with other gardeners.
+    header: Community Gardens
+    lead: Growstuff is open source and the perfect place to manage your community garden. Track your plantings, celebrate your harvests, and collaborate with your fellow gardeners, all in one place.
+    get_started: Get Started Today
+    get_started_text: Signing up for Growstuff is free and easy. Create an account to start tracking your garden today.
+    sign_up: Sign up for free
+    collaborate: Collaborate with Your Team
+    collaborate_text: Invite other gardeners to collaborate on your garden plots. Share the work, share the harvest, and grow together as a community.
+    learn_more: Learn more about gardens
+    features_title: Features for Community Gardens
   label:
     days_until_harvest: "%{number} days"
     weeks_until_harvest: "%{number} weeks until harvest"
@@ -235,6 +302,7 @@ en:
       browse_members: Browse Members
       community: Community
       community_map: Community Map
+      community_gardens: Community Gardens
       garden_type: Garden Type
       garden_types: Garden Types
       crop_wrangling: Crop Wrangling
@@ -262,6 +330,21 @@ en:
   links:
     my_gardens: My gardens
 
+  messages:
+    auth_success: Authentication successful.
+    auth_failed: Authentication failed.
+    crops_waiting: There are crops waiting to be wrangled.
+    followed: "Followed %{name}"
+    unfollowed: "Unfollowed %{name}"
+    follow_error: Already following or error while following.
+    transplant_success: Planting was successfully transplanted.
+    transplant_error: "There was an error transplanting the planting: %{errors}"
+    revert_success: "Reverted to version from %{date}"
+    revert_error: "Could not revert to version from %{date}. Errors: %{errors}"
+    invalid_location: Please enter a valid location
+    unable_to_like: Unable to like
+    unable_to_unlike: Unable to unlike
+
   members:
     edit_profile: Edit profile
     index:
@@ -329,10 +412,22 @@ en:
       progress_0_not_planted_yet: 'Progress: 0% - not planted yet'
   posts:
     write_blog_post: Write blog post
+    created: Post was successfully created.
+    updated: Post was successfully updated.
+    deleted: Post was deleted.
     index:
       title:
         author_posts: "%{author} posts"
         default: Everyone's posts
+  scientific_names:
+    deleted: Scientific name was successfully deleted.
+  alternate_names:
+    created: Alternate name was successfully created.
+    updated: Alternate name was successfully updated.
+    deleted: Alternate name was successfully deleted.
+  crop_companions:
+    created: Companion was successfully created.
+    deleted: Companion was successfully destroyed.
   seeds:
     form:
       trade_help: >
@@ -348,6 +443,7 @@ en:
         owner_seeds: "%{owner} seeds"
     save_seeds: Save seeds
     string: "%{crop} seeds belonging to %{owner}"
+    added_to_stash: Successfully added %{crop} seed to your stash.
   unauthorized:
     create:
       all: Please sign in or sign up to create a %{subject}.