Manually generate

.devcontainer/Dockerfile

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

.devcontainer/docker-compose.yml

@@ -27,7 +27,7 @@ services:
     command: sleep infinity
 
   db:
-    image: postgres:17
+    image: postgres:latest
     restart: unless-stopped
     volumes:
       - postgres-data:/var/lib/postgresql/data

.dockerignore

@@ -1,30 +0,0 @@
-.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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -74,9 +74,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
   contributors:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - name: Install ruby version specified in .ruby-version
         uses: ruby/setup-ruby@v1
         with:
@@ -53,7 +53,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
+        uses: actions/cache@v4
         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 }}
@@ -89,9 +89,9 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

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

@@ -1,43 +0,0 @@
-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

@@ -1,5 +1,5 @@
 inherit_from: .rubocop_todo.yml
-plugins:
+require:
  - rubocop-factory_bot
  - rubocop-capybara
  - rubocop-rails
@@ -24,7 +24,6 @@ Naming/FileName:
 
 RSpec/DescribeClass:
   Exclude:
-   - 'spec/tasks/import_spec.rb'
    - 'spec/views/**/*.rb'
    - 'spec/features/**/*.rb'
 
@@ -72,7 +71,4 @@ 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,22 +1,33 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-04-25 16:44:38 UTC using RuboCop version 1.86.1.
+# on 2024-07-13 05:47:38 UTC using RuboCop version 1.65.0.
 # 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: 19
-Capybara/NegationMatcherAfterVisit:
+# 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:
   Exclude:
-    - '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/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/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:
@@ -32,22 +43,21 @@ Capybara/VisibilityMatcher:
   Exclude:
     - 'spec/features/shared_examples/crop_suggest.rb'
 
-# Offense count: 8
+# Offense count: 6
 # 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: EnforcedStyle, ExplicitOnly.
+# Configuration parameters: AutoCorrect, Include, EnforcedStyle, ExplicitOnly.
+# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
 # SupportedStyles: create_list, n_times
 FactoryBot/CreateList:
   Exclude:
@@ -56,50 +66,31 @@ FactoryBot/CreateList:
     - 'spec/views/posts/index.html.haml_spec.rb'
 
 # Offense count: 4
-# Configuration parameters: MaxAmount.
+# Configuration parameters: Include, MaxAmount.
+# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
 FactoryBot/ExcessiveCreateList:
   Exclude:
     - 'spec/controllers/posts_controller_spec.rb'
     - 'spec/features/crops/show_spec.rb'
     - 'spec/features/percy/percy_spec.rb'
 
-# Offense count: 312
-# This cop supports safe autocorrection (--autocorrect).
-# 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: 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: 5
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:
-    - 'Gemfile'
-    - 'app/controllers/admin/versions_controller.rb'
-    - 'app/models/concerns/predict_planting.rb'
-    - 'app/models/crop.rb'
+    - 'app/helpers/crops_helper.rb'
     - 'db/seeds.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Lint/AmbiguousOperatorPrecedence:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-
-# Offense count: 4
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: RequireParenthesesForMethodChains.
 Lint/AmbiguousRange:
@@ -107,33 +98,25 @@ 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, IgnoreDuplicateElseBranch.
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
   Exclude:
     - 'app/models/harvest.rb'
     - 'lib/actions/oauth_signup_action.rb'
 
-# Offense count: 1
-Lint/DuplicateMethods:
+# Offense count: 8
+# Configuration parameters: AllowComments, AllowEmptyLambdas.
+Lint/EmptyBlock:
   Exclude:
-    - 'app/models/planting.rb'
+    - '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'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -153,80 +136,57 @@ Lint/SuppressedException:
   Exclude:
     - 'lib/tasks/testing.rake'
 
-# Offense count: 1
-Lint/UselessConstantScoping:
+# Offense count: 7
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect.
+Lint/UselessAssignment:
   Exclude:
-    - 'app/controllers/members_controller.rb'
+    - 'config.rb'
+    - 'config/compass.rb'
 
-# Offense count: 61
+# Offense count: 52
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 295
+  Max: 151
 
 # Offense count: 14
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 294
+  Max: 115
 
-# Offense count: 10
+# Offense count: 7
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 298
+  Max: 188
 
-# Offense count: 1
-# Configuration parameters: LengthThreshold.
-Metrics/CollectionLiteralLength:
-  Exclude:
-    - 'lib/tasks/import.rake'
-
-# Offense count: 10
+# Offense count: 6
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 32
 
-# Offense count: 82
+# Offense count: 71
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 296
+  Max: 127
 
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 144
+  Max: 125
 
-# Offense count: 8
+# Offense count: 5
 # 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: 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
+# Offense count: 292
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -242,12 +202,48 @@ RSpec/DescribedClass:
     - 'spec/models/member_spec.rb'
     - 'spec/services/timeline_service_spec.rb'
 
-# Offense count: 146
+# 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
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 27
+  Max: 25
 
 # 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).
@@ -259,30 +255,11 @@ 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:
@@ -295,15 +272,16 @@ 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: 719
+# Offense count: 720
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Enabled: false
 
-# Offense count: 41
+# Offense count: 40
 RSpec/LetSetup:
   Enabled: false
 
@@ -329,38 +307,37 @@ RSpec/MultipleDescribes:
   Exclude:
     - 'spec/features/crops/crop_wranglers_spec.rb'
 
-# Offense count: 191
+# Offense count: 152
 RSpec/MultipleExpectations:
   Max: 19
 
-# Offense count: 166
+# Offense count: 138
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
-  Max: 16
+  Max: 20
 
-# Offense count: 183
+# Offense count: 133
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 109
+# Offense count: 111
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 6
 
-# Offense count: 407
+# Offense count: 403
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
   Enabled: false
 
-# Offense count: 4
+# Offense count: 3
 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:
@@ -381,14 +358,15 @@ 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: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
-# SupportedInflectors: default, active_support
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
 RSpec/SpecFilePathFormat:
   Exclude:
     - 'spec/controllers/member_controller_spec.rb'
@@ -402,6 +380,8 @@ 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'
@@ -414,38 +394,47 @@ RSpec/VerifiedDoubles:
     - 'spec/controllers/gardens_controller_spec.rb'
     - 'spec/views/devise/shared/_links_spec.rb'
 
-# Offense count: 30
-# Configuration parameters: Database.
+# 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.
 # 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: 8
+# Offense count: 1
 # 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: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: slashes, arguments
-Rails/FilePath:
-  Exclude:
-    - 'lib/tasks/import.rake'
-
-# Offense count: 12
+# Offense count: 11
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 # AllowedMethods: order, limit, select, lock
@@ -456,35 +445,38 @@ 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: 6
+# Offense count: 5
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
 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: 1
-# Configuration parameters: IgnoreScopes.
-Rails/InverseOf:
-  Exclude:
-    - 'app/models/member.rb'
+# Offense count: 33
+Rails/I18nLocaleTexts:
+  Enabled: false
 
-# Offense count: 4
+# Offense count: 3
+# Configuration parameters: Include.
+# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
 Rails/LexicallyScopedActionFilter:
   Exclude:
-    - 'app/controllers/api/v1/base_controller.rb'
     - 'app/controllers/data_controller.rb'
     - 'app/controllers/registrations_controller.rb'
 
@@ -500,23 +492,17 @@ 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: 8
+# Offense count: 9
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedReceivers.
 # AllowedReceivers: ActionMailer::Preview, ActiveSupport::TimeZone
@@ -527,8 +513,9 @@ Rails/RedundantActiveRecordAllMethod:
     - 'app/controllers/forums_controller.rb'
     - 'app/controllers/plant_parts_controller.rb'
     - 'app/controllers/scientific_names_controller.rb'
-    - 'spec/features/members/deletion_spec.rb'
+    - 'app/services/openfarm_service.rb'
     - 'spec/features/percy/percy_spec.rb'
+    - 'spec/models/harvest_spec.rb'
 
 # Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -539,13 +526,14 @@ Rails/RedundantPresenceValidationOnBelongsTo:
     - 'app/models/planting.rb'
     - 'app/models/scientific_name.rb'
 
-# Offense count: 16
+# Offense count: 15
 # 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'
@@ -555,35 +543,29 @@ 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: 6
+# Offense count: 2
 # 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'
@@ -601,28 +583,24 @@ Rails/WhereEquals:
     - 'app/models/harvest.rb'
     - 'app/models/planting.rb'
 
-# Offense count: 3
+# Offense count: 2
 # 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: 4
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
+# Configuration parameters: EnforcedStyle.
 # 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'
@@ -637,52 +615,30 @@ 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: 2
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
   Exclude:
     - 'config/environments/production.rb'
     - 'lib/tasks/gbif.rake'
-
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/IdenticalConditionalBranches:
-  Exclude:
-    - 'lib/actions/oauth_signup_action.rb'
+    - 'lib/tasks/openfarm.rake'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
-Style/MapIntoArray:
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: nonzero?
+Style/IfWithBooleanLiteralBranches:
   Exclude:
-    - 'app/helpers/crops_helper.rb'
+    - 'app/controllers/gardens_controller.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -704,13 +660,12 @@ Style/MutableConstant:
   Exclude:
     - 'app/models/activity.rb'
 
-# Offense count: 6
+# Offense count: 5
 # 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'
@@ -721,12 +676,11 @@ Style/OpenStructUse:
   Exclude:
     - 'spec/helpers/event_helper_spec.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
   Exclude:
-    - 'app/helpers/application_helper.rb'
     - 'app/models/concerns/member_newsletter.rb'
 
 # Offense count: 1
@@ -743,34 +697,20 @@ Style/RedundantFetchBlock:
   Exclude:
     - 'config/puma.rb'
 
-# 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
+# Offense count: 2
 # 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: 27
+# Offense count: 24
 # 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.4.8
+3.3.8

.scss-lint.yml

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

.travis.yml

@@ -0,0 +1,31 @@
+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

@@ -1,52 +0,0 @@
-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,11 +136,6 @@ 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'
@@ -192,17 +187,18 @@ end
 group :test do
   gem 'axe-core-capybara'
   gem 'axe-core-rspec'
-  gem "percy-capybara", "~> 5.0.0"
   gem 'rails-controller-testing'
-  gem "rspec-rebound"
   gem 'selenium-webdriver'
   gem 'timecop'
   gem 'vcr'
+  gem "rspec-rebound"
+  gem "percy-capybara", "~> 5.0.0"
 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,78 +33,76 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actioncable (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    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)
+    actionmailbox (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       mail (>= 2.8.0)
-    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)
+    actionmailer (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      actionview (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.3.1)
-      actionview (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
-      cgi
+    actionpack (7.2.2.2)
+      actionview (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4, < 3.3)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    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)
+    actiontext (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actionview (7.2.2.2)
+      activesupport (= 7.2.2.2)
       builder (~> 3.1)
-      cgi
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
     active_link_to (1.0.5)
       actionpack
       addressable
-    active_median (1.0.0)
-      activesupport (>= 7.2)
-    active_record_union (1.4.0)
-      activerecord (>= 6.0)
-    active_utils (3.6.0)
+    active_median (0.6.0)
+      activesupport (>= 7.1)
+    active_record_union (1.3.0)
+      activerecord (>= 4.0)
+    active_utils (3.5.0)
       activesupport (>= 4.2)
       i18n
-    activejob (7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activejob (7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.3.6)
-    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)
+    activemodel (7.2.2.2)
+      activesupport (= 7.2.2.2)
+    activerecord (7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       timeout (>= 0.4.0)
-    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)
+    activestorage (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       marcel (~> 1.0)
-    activesupport (7.2.3.1)
+    activesupport (7.2.2.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -113,42 +111,23 @@ GEM
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
-      minitest (>= 5.1, < 6)
+      minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.9.0)
-      public_suffix (>= 2.0.2, < 8.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.3)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    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)
+    axe-core-api (4.10.3)
       dumb_delegator
       ostruct
       virtus
-    axe-core-capybara (4.11.2)
-      axe-core-api (= 4.11.2)
+    axe-core-capybara (4.10.3)
+      axe-core-api (= 4.10.3)
       dumb_delegator
-    axe-core-rspec (4.11.2)
-      axe-core-api (= 4.11.2)
+    axe-core-rspec (4.10.3)
+      axe-core-api (= 4.10.3)
       dumb_delegator
       ostruct
       virtus
@@ -157,13 +136,13 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.3.0)
-    bcrypt (3.1.22)
-    benchmark (0.5.0)
+    bcrypt (3.1.20)
+    benchmark (0.4.1)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (4.1.2)
+    bigdecimal (3.2.3)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (7.0.1)
       elasticsearch-model (< 8)
@@ -177,11 +156,10 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.3.0)
-    bullet (8.1.1)
+    bullet (8.0.8)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    byebug (13.0.0)
-      reline (>= 0.6.0)
+    byebug (12.0.0)
     cancancan (3.6.1)
     capybara (3.40.0)
       addressable
@@ -195,7 +173,7 @@ GEM
     capybara-email (3.0.2)
       capybara (>= 2.4, < 4.0)
       mail
-    capybara-screenshot (1.0.27)
+    capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
     carrierwave (3.0.7)
@@ -205,10 +183,8 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    cgi (0.5.1)
-    chartkick (5.2.1)
-    childprocess (5.1.0)
-      logger (~> 1.5)
+    chartkick (5.2.0)
+    childprocess (5.0.0)
     coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -221,8 +197,8 @@ GEM
     coffee-script-source (1.12.2)
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
-    concurrent-ruby (1.3.6)
-    connection_pool (2.5.5)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.4)
     crass (1.0.6)
     crowdin-api (1.12.0)
       open-uri (>= 0.1.0, < 0.2.0)
@@ -232,34 +208,33 @@ GEM
       gli (>= 2.7.0)
       i18n (>= 0.6.4)
       rubyzip (>= 1.0.0)
-    csv (3.3.5)
+    csv (3.3.1)
     csv_shaper (1.4.0)
       activesupport (>= 3.0.0)
       csv
-    dalli (5.0.2)
-      logger
+    dalli (3.2.8)
     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.1)
+    date (3.4.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (5.0.3)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 7.0)
+      railties (>= 4.1.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.2.0)
-    dotenv-rails (3.2.0)
-      dotenv (= 3.2.0)
+    dotenv (3.1.8)
+    dotenv-rails (3.1.8)
+      dotenv (= 3.1.8)
       railties (>= 6.1)
     drb (2.2.3)
     dumb_delegator (1.1.0)
@@ -276,31 +251,33 @@ GEM
     elasticsearch-transport (7.0.0)
       faraday
       multi_json
-    erb (6.0.2)
+    erb (5.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.8.0)
+    faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.1)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.2)
-      net-http (~> 0.5)
-    ffi (1.17.3)
-    ffi (1.17.3-x86_64-linux-gnu)
+    faraday-net_http (3.4.1)
+      net-http (>= 0.5.0)
+    ffi (1.16.3)
     flickraw (0.9.10)
     font-awesome-sass (5.15.1)
       sassc (>= 1.11)
-    friendly_id (5.6.0)
+    friendly_id (5.5.1)
       activerecord (>= 4.0.0)
     gbifrb (0.2.0)
-    geocoder (1.8.6)
+    geocoder (1.8.5)
       base64 (>= 0.1.0)
       csv (>= 3.0.0)
     gibbon (1.2.1)
@@ -308,54 +285,59 @@ GEM
       multi_json (>= 1.9.0)
     gli (2.22.2)
       ostruct
-    globalid (1.3.0)
+    globalid (1.2.1)
       activesupport (>= 6.1)
     gravatar-ultimate (2.0.0)
       activesupport (>= 2.3.14)
       rack
-    haml (7.2.0)
+    haml (6.3.0)
       temple (>= 0.8.2)
       thor
       tilt
-    haml-rails (3.0.0)
+    haml-rails (2.1.0)
       actionpack (>= 5.1)
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.73.0)
+    haml_lint (0.66.0)
       haml (>= 5.0)
-      parallel (>= 1.10)
+      parallel (~> 1.10)
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
-    hashie (5.1.0)
-      logger
+    hashie (5.0.0)
+    heroics (0.1.3)
+      base64
+      erubis (~> 2.0)
+      excon
+      moneta
+      multi_json (>= 1.9.2)
+      webrick
     highline (3.1.2)
       reline
     http-accept (1.7.0)
     http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httparty (0.24.0)
+    httparty (0.22.0)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.8)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.1.2)
+    i18n-tasks (1.0.15)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       erubi
-      highline (>= 3.0.0)
+      highline (>= 2.0.0)
       i18n
       parser (>= 3.2.2.1)
-      prism
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.8, >= 1.8.1)
       terminal-table (>= 1.5.1)
     i18n_data (1.1.0)
       simple_po_parser (~> 1.1)
-    icalendar (2.12.2)
+    icalendar (2.11.2)
       base64
       ice_cube (~> 0.16)
       logger
@@ -365,21 +347,18 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.2)
-    irb (1.17.0)
+    io-console (0.8.1)
+    irb (1.15.2)
       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)
+    jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.19.3)
-    json-schema (6.2.0)
+    json (2.13.2)
+    json-schema (5.1.0)
       addressable (~> 2.8)
-      bigdecimal (>= 3.1, < 5)
     jsonapi-resources (0.10.7)
       activerecord (>= 4.1)
       concurrent-ruby
@@ -389,26 +368,23 @@ GEM
     kramdown (2.4.0)
       rexml
     language_server-protocol (3.17.0.5)
-    launchy (3.1.1)
+    launchy (3.0.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.10.0)
-      logger
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.25.1)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.9.0)
-      logger
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -422,7 +398,7 @@ GEM
       sass (>= 3.5.2)
     material_icons (4.0.0)
       railties (>= 3.2)
-    matrix (0.4.3)
+    matrix (0.4.2)
     memcachier (0.0.2)
     method_source (1.1.0)
     mime-types (3.7.0)
@@ -435,14 +411,15 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.27.0)
+    minitest (5.25.5)
+    moneta (1.0.0)
     msgpack (1.8.0)
-    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)
+    multi_json (1.15.0)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
+    net-http (0.6.0)
+      uri
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
@@ -452,14 +429,14 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     netrc (0.11.0)
-    nio4r (2.7.5)
-    nokogiri (1.19.2)
+    nio4r (2.7.4)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.17.0)
+    oj (3.16.11)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -474,35 +451,35 @@ GEM
     open-uri (0.1.0)
     orm_adapter (0.5.0)
     ostruct (0.6.3)
-    paper_trail (17.0.0)
-      activerecord (>= 7.1)
-      request_store (~> 1.4)
-    parallel (2.0.1)
-    parser (3.3.11.1)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     percy-capybara (5.0.0)
       capybara (>= 3)
-    pg (1.6.3)
-    pg (1.6.3-x86_64-linux)
+    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)
     popper_js (2.11.8)
-    pp (0.6.3)
+    pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.9.0)
-    pry (0.16.0)
+    prism (1.4.0)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-      reline (>= 0.6.0)
-    psych (5.3.1)
+    psych (5.2.6)
       date
       stringio
-    public_suffix (7.0.5)
-    puma (8.0.0)
+    public_suffix (6.0.1)
+    puma (7.0.2)
       nio4r (~> 2.0)
-    query_diet (0.7.3)
+    query_diet (0.7.2)
     racc (1.8.1)
-    rack (2.2.23)
+    rack (2.2.17)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -515,20 +492,20 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    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)
+    rails (7.2.2.2)
+      actioncable (= 7.2.2.2)
+      actionmailbox (= 7.2.2.2)
+      actionmailer (= 7.2.2.2)
+      actionpack (= 7.2.2.2)
+      actiontext (= 7.2.2.2)
+      actionview (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       bundler (>= 1.15.0)
-      railties (= 7.2.3.1)
+      railties (= 7.2.2.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -537,8 +514,8 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.7.0)
-      loofah (~> 2.25)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
       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)
@@ -548,43 +525,39 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
-      cgi
+    railties (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
-      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     raindrops (0.20.1)
-    rake (13.4.2)
+    rake (13.3.0)
+    rate_throttle_client (0.1.2)
     rb-fsevent (0.11.2)
-    rb-inotify (0.11.1)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (7.2.0)
+    rdoc (6.14.2)
       erb
       psych (>= 4.0.0)
-      tsort
-    recaptcha (5.21.2)
-    redis-client (0.26.2)
+    recaptcha (5.20.1)
+    redis-client (0.23.2)
       connection_pool
-    regexp_parser (2.12.0)
-    reline (0.6.3)
+    regexp_parser (2.11.2)
+    reline (0.6.2)
       io-console (~> 0.5)
-    request_store (1.7.0)
-      rack (>= 1.4)
-    responders (3.2.0)
-      actionpack (>= 7.0)
-      railties (>= 7.0)
+    responders (3.1.1)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.4.4)
+    rexml (3.4.1)
     rouge (4.1.2)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -594,61 +567,61 @@ GEM
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.13.6)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.8)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (8.0.4)
+    rspec-rails (8.0.2)
       actionpack (>= 7.2)
       activesupport (>= 7.2)
       railties (>= 7.2)
-      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-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
     rspec-rebound (0.2.1)
       rspec-core (~> 3.3)
-    rspec-support (3.13.7)
+    rspec-support (3.13.4)
     rspectre (0.2.0)
       parser (>= 3.3.7.1)
       prism (~> 1.3)
       rspec (~> 3.10)
-    rswag-api (2.17.0)
-      activesupport (>= 5.2, < 8.2)
-      railties (>= 5.2, < 8.2)
-    rswag-specs (2.17.0)
-      activesupport (>= 5.2, < 8.2)
-      json-schema (>= 2.2, < 7.0)
-      railties (>= 5.2, < 8.2)
+    rswag-api (2.16.0)
+      activesupport (>= 5.2, < 8.1)
+      railties (>= 5.2, < 8.1)
+    rswag-specs (2.16.0)
+      activesupport (>= 5.2, < 8.1)
+      json-schema (>= 2.2, < 6.0)
+      railties (>= 5.2, < 8.1)
       rspec-core (>= 2.14)
-    rswag-ui (2.17.0)
-      actionpack (>= 5.2, < 8.2)
-      railties (>= 5.2, < 8.2)
-    rubocop (1.86.1)
+    rswag-ui (2.16.0)
+      actionpack (>= 5.2, < 8.1)
+      railties (>= 5.2, < 8.1)
+    rubocop (1.80.2)
       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.49.0, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.1)
+    rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.7)
+      prism (~> 1.4)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-factory_bot (2.28.0)
+    rubocop-factory_bot (2.27.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.34.3)
+    rubocop-rails (2.33.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -657,10 +630,10 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.9.0)
+    rubocop-rspec (3.7.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.81)
-    rubocop-rspec_rails (2.32.0)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
       rubocop-rspec (~> 3.5)
@@ -668,7 +641,7 @@ GEM
     ruby-units (4.1.0)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
-    rubyzip (3.2.2)
+    rubyzip (3.0.1)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -682,27 +655,25 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (6.2.0)
+    scout_apm (5.7.1)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.43.0)
+    selenium-webdriver (4.35.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.10)
+    sidekiq (7.3.9)
       base64
-      connection_pool (>= 2.3.0, < 3)
+      connection_pool (>= 2.3.0)
       logger
-      rack (>= 2.2.4, < 3.3)
-      redis-client (>= 0.23.0, < 1)
+      rack (>= 2.2.4)
+      redis-client (>= 0.22.2)
     simple_po_parser (1.1.6)
-    sitemap_generator (6.3.0)
-      builder (~> 3.0)
     sprockets (3.7.5)
       base64
       concurrent-ruby (~> 1.0)
@@ -712,34 +683,34 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.2.0)
+    stringio (3.1.7)
     sysexits (1.2.0)
     temple (0.10.4)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    terser (1.2.7)
+    terser (1.2.6)
       execjs (>= 0.3.0, < 3)
-    thor (1.5.0)
+    thor (1.4.0)
     thread_safe (0.3.6)
-    tilt (2.7.0)
-    timecop (0.9.11)
-    timeout (0.5.0)
-    tsort (0.2.0)
+    tilt (2.6.1)
+    timecop (0.9.10)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.2.0)
-      unicode-emoji (~> 4.1)
-    unicode-emoji (4.2.0)
+    unicode-display_width (3.1.5)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    uniform_notifier (1.18.0)
-    uri (1.1.1)
+    uniform_notifier (1.17.0)
+    uri (1.0.3)
     useragent (0.16.11)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    vcr (6.4.0)
+    vcr (6.3.1)
+      base64
     virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -750,7 +721,7 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    webrick (1.9.2)
+    webrick (1.9.1)
     websocket (1.2.11)
     websocket-driver (0.8.0)
       base64
@@ -759,12 +730,11 @@ GEM
     will_paginate (4.0.1)
     will_paginate-bootstrap-style (0.3.0)
       will_paginate (~> 4.0, >= 4.0.0)
-    xmlrpc (0.3.4)
-      rexml
+    xmlrpc (0.3.3)
       webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.5)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby
@@ -774,7 +744,6 @@ DEPENDENCIES
   active_median
   active_record_union
   active_utils
-  aws-sdk-s3 (~> 1, >= 1.114.0)
   axe-core-capybara
   axe-core-rspec
   better_errors
@@ -793,7 +762,6 @@ DEPENDENCIES
   chartkick
   coffee-rails
   comfortable_mexican_sofa!
-  connection_pool (< 3)
   crowdin-cli
   csv_shaper
   dalli
@@ -835,9 +803,9 @@ DEPENDENCIES
   oj
   omniauth (~> 1.3)
   omniauth-flickr (>= 0.0.15)
-  paper_trail (~> 17.0)
   percy-capybara (~> 5.0.0)
   pg
+  platform-api
   pry
   puma
   query_diet
@@ -870,7 +838,6 @@ DEPENDENCIES
   searchkick
   selenium-webdriver
   sidekiq
-  sitemap_generator
   sprockets (< 4)
   terser
   timecop
@@ -883,7 +850,7 @@ DEPENDENCIES
   xmlrpc
 
 RUBY VERSION
-   ruby 3.4.8p72
+   ruby 3.3.8p144
 
 BUNDLED WITH
    2.4.22

README.md

@@ -25,6 +25,7 @@ Vibe Coding is more than okay, just make sure you indicate if you have done so a
 
 * [Issues](https://github.com/orgs/Growstuff/projects/1) (features we're
   working on, known bugs, etc)
+* [![Gitter](https://badges.gitter.im/Growstuff/growstuff.svg)](https://gitter.im/Growstuff/growstuff?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 * [Wiki](https://github.com/Growstuff/growstuff/wiki) (general documentation, etc.)
 
 ## For coders

app/assets/stylesheets/_homepage.scss

@@ -16,27 +16,3 @@
 .homepage--list-item {
   height: 100px;
 }
-.releases {
-  .card { 
-    .card-header {
-      
-    }
-    .card-body { 
-      h2 {
-        background-color: transparent;
-        color: black;
-        box-shadow: none;
-      }
-      img {
-        border: 0.5em solid #111;
-        margin-left: 5%;
-        margin-right: 5%;
-        width: 90%;
-      }
-      ul {
-        margin-bottom: 1em;
-        margin-top: 1em;
-      }
-    }
-  }
-}

app/assets/stylesheets/application.scss

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

app/controllers/activities_controller.rb

@@ -24,29 +24,14 @@ class ActivitiesController < DataController
   end
 
   def show
-    if @activity.finished? && @activity.owner == current_member && (@activity.updated_at + 2.weeks) > Time.now
-      @repeat_link = new_activity_path(
-        name:        @activity.name,
-        garden_id:   @activity.garden_id,
-        planting_id: @activity.planting_id,
-        category:    @activity.category,
-        description: @activity.description,
-        due_date:    2.weeks.from_now.to_date
-      )
-    end
-
     respond_with @activity
   end
 
   def new
     @activity = Activity.new(
-      owner:    current_member,
+      owner: current_member,
       due_date: Date.today
     )
-    @activity.name = params[:name] if params[:name]
-    @activity.description = params[:description] if params[:description]
-    @activity.category = params[:category] if params[:category]
-    @activity.due_date = params[:due_date] if params[:due_date]
     if params[:garden_id]
       @activity.garden = Garden.find_by(
         owner: current_member,
@@ -73,21 +58,7 @@ class ActivitiesController < DataController
   def create
     @activity = Activity.new(activity_params)
     @activity.owner = current_member
-    @activity.due_date ||= Date.today
-
-    if @activity.save
-      if params[:repeat_times].to_i > 0
-        repeat_times = params[:repeat_times].to_i
-        repeat_weeks = params[:repeat_weeks].to_i
-
-        repeat_times.times do |i|
-          new_activity = @activity.dup
-          new_activity.due_date = @activity.due_date + (i + 1) * repeat_weeks.weeks
-          new_activity.save
-        end
-      end
-    end
-
+    @activity.save
     respond_with @activity
   end
 
@@ -106,8 +77,7 @@ class ActivitiesController < DataController
   def activity_params
     params.require(:activity).permit(
       :name, :description, :category, :finished,
-      :garden_id, :planting_id, :due_date,
-      :repeat_times, :repeat_weeks
+      :garden_id, :planting_id, :due_date
     )
   end
 

app/controllers/admin/crop_companions_controller.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
-  class CropCompanionsController < AdminController
-    before_action :set_crop
-
-    def index
-      @crop_companions = @crop.crop_companions
-    end
-
-    def new
-      @crop_companion = @crop.crop_companions.new
-    end
-
-    def create
-      @crop_companion = @crop.crop_companions.new(crop_companion_params)
-      if @crop_companion.save
-        redirect_to admin_crop_crop_companions_path(@crop), notice: t('crop_companions.created')
-      else
-        render :new
-      end
-    end
-
-    def destroy
-      @crop_companion = @crop.crop_companions.find(params[:id])
-      @crop_companion.destroy
-      redirect_to admin_crop_crop_companions_path(@crop), notice: t('crop_companions.deleted')
-    end
-
-    private
-
-    def set_crop
-      @crop = Crop.find_by!(slug: params[:crop_slug])
-    end
-
-    def crop_companion_params
-      params.require(:crop_companion).permit(:crop_b_id, :source_url)
-    end
-  end
-end

app/controllers/admin/crops_controller.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class Admin::CropsController < ApplicationController
-  before_action :authenticate_member!
-  before_action :authorize_admin!
-
-  def index
-    @versions = PaperTrail::Version.where(item_type: 'Crop').order(created_at: :desc).limit(100)
-    member_ids = @versions.map(&:whodunnit).compact.map(&:to_i)
-    @members = Member.where(id: member_ids).index_by(&:id)
-    @crop_wranglers = Role.crop_wranglers
-  end
-
-  private
-
-  def authorize_admin!
-    authorize! :wrangle, Crop
-  end
-end

app/controllers/admin/members_controller.rb

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

app/controllers/admin/versions_controller.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
-  class VersionsController < ApplicationController
-    before_action :authenticate_member!
-    before_action :authorize_admin!
-
-    def revert
-      @version = PaperTrail::Version.find(params[:id])
-      @object = @version.reify
-      if @object.save
-        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: t('messages.revert_error', date: @version.created_at.strftime('%B %d, %Y'), errors: @object.errors.full_messages.to_sentence)
-      end
-    end
-
-    private
-
-    def authorize_admin!
-      authorize! :wrangle, Crop
-    end
-  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: t('alternate_names.created')
+      redirect_to @alternate_name.crop, notice: 'Alternate name was successfully 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: t('alternate_names.updated')
+      redirect_to @alternate_name.crop, notice: 'Alternate name was successfully 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: t('alternate_names.deleted')
+    redirect_to @crop, notice: 'Alternate name was successfully deleted.'
   end
 
   private

app/controllers/authentications_controller.rb

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

app/controllers/blocks_controller.rb

@@ -1,32 +0,0 @@
-# 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

@@ -73,8 +73,6 @@ class CropsController < ApplicationController
       format.html do
         @posts = @crop.posts.order(created_at: :desc).paginate(page: params[:page])
         @companions = @crop.companions.approved
-        member_ids = @crop.versions.map(&:whodunnit).compact.map(&:to_i)
-        @version_members = Member.where(id: member_ids).index_by(&:id)
       end
       format.svg do
         icon_data = @crop.svg_icon.presence || File.read(Rails.root.join("app/assets/images/icons/sprout.svg"))
@@ -149,34 +147,6 @@ class CropsController < ApplicationController
     respond_with @crop
   end
 
-  def data_improvement
-    @active_tab = params[:tab] || 'photos'
-
-    @crops = case @active_tab
-             when 'photos'
-               Crop.approved.where(photo_associations_count: 0).order(plantings_count: :desc)
-             when 'descriptions'
-               Crop.approved.where(description: [nil, '']).order(plantings_count: :desc)
-             when 'youtube'
-               Crop.approved.where(en_youtube_url: [nil, '']).order(plantings_count: :desc)
-             when 'alternate_names'
-               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)
-             when 'row_spacing'
-               Crop.approved.where(row_spacing: nil).order(plantings_count: :desc)
-             when 'sun_requirements'
-               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
-  end
-
   private
 
   def notifier
@@ -218,12 +188,10 @@ class CropsController < ApplicationController
 
   def crop_params
     params.require(:crop).permit(
-      :name, :en_wikipedia_url, :en_youtube_url,
+      :name, :en_wikipedia_url,
       :parent_id, :perennial,
       :request_notes, :reason_for_rejection,
       :rejection_notes,
-      :description,
-      :public_food_key,
       :row_spacing, :spread, :height,
       :sowing_method, :sun_requirements, :growing_degree_days,
       scientific_names_attributes: %i(scientific_name _destroy id)

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] = t('messages.followed', name: @follow.followed.login_name)
+      flash[:notice] = "Followed #{@follow.followed.login_name}"
     else
-      flash[:error] = t('messages.follow_error')
+      flash[:error] = "Already following or error while following."
     end
-    redirect_back_or_to(root_path)
+    redirect_back fallback_location: root_path
   end
 
   def destroy
@@ -25,7 +25,7 @@ class FollowsController < ApplicationController
     @unfollowed = @follow.followed
     @follow.destroy
 
-    flash[:notice] = t('messages.unfollowed', name: @unfollowed.login_name)
+    flash[:notice] = "Unfollowed #{@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] = t('forums.created') if @forum.save
+    flash[:notice] = 'Forum was successfully created.' if @forum.save
     respond_with(@forum)
   end
 
   # PUT /forums/1
   # PUT /forums/1.json
   def update
-    flash[:notice] = t('forums.updated') if @forum.update(forum_params)
+    flash[:notice] = 'Forum was successfully 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] = t('forums.deleted')
+    flash[:notice] = 'Forum was successfully deleted'
     redirect_to forums_url
   end
 

app/controllers/gardens_controller.rb

@@ -39,10 +39,7 @@ class GardensController < DataController
 
   def create
     @garden.owner_id = current_member.id
-    if @garden.save
-      link = new_activity_path(name: 'Weed the garden bed', garden_id: @garden.id, due_date: 2.weeks.from_now.to_date)
-      flash[:notice] = t('gardens.created_prompt_html', link: link).html_safe
-    end
+    flash[:notice] = I18n.t('gardens.created') if @garden.save
     respond_with(@garden)
   end
 

app/controllers/home_controller.rb

@@ -10,6 +10,4 @@ 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: t('messages.unable_to_like'))
+      failed(@like, message: '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: t('messages.unable_to_unlike'))
+      failed(@like, message: 'Unable to unlike')
     end
   end
 

app/controllers/messages_controller.rb

@@ -27,21 +27,10 @@ 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] = t('messages.auth_failed')
+    flash[:alert] = "Authentication 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: t('messages.invalid_location')
+      redirect_to places_path, alert: 'Please enter a valid location'
     else
       redirect_to place_path(params[:new_place])
     end

app/controllers/plantings_controller.rb

@@ -46,12 +46,6 @@ class PlantingsController < DataController
       .where.not(id: @planting.id)
       .includes(:owner, :crop, :garden)
       .limit(6)
-
-    if @planting.finished? && @planting.garden.plantings.current.none? && (@planting.updated_at + 2.weeks) > Time.zone.now
-      @cultivate_soil_link = new_activity_path(name: 'Cultivate soil', garden_id: @planting.garden_id, category: "Soil Cultivation",
-                                               description: "Recently finished #{@planting.crop.name} planting. Prepare for next planting.")
-    end
-
     respond_with @planting
   end
 
@@ -116,11 +110,11 @@ class PlantingsController < DataController
     new_planting.finished_at = nil
 
     if new_planting.save
-      redirect_to edit_planting_path(new_planting), notice: t('messages.transplant_success')
+      redirect_to edit_planting_path(new_planting), notice: 'Planting was successfully transplanted.'
     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: t('messages.transplant_error', errors: new_planting.errors.full_messages.to_sentence)
+      redirect_to @planting, alert: "There was an error transplanting the planting: #{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] = t('posts.created') if @post.save
+    flash[:notice] = 'Post was successfully created.' if @post.save
     respond_with(@post)
   end
 
   def update
-    flash[:notice] = t('posts.updated') if @post.update(post_params)
+    flash[:notice] = 'Post was successfully updated.' if @post.update(post_params)
     respond_with(@post)
   end
 
   def destroy
-    flash[:notice] = t('posts.deleted') if @post.destroy
+    flash[:notice] = 'Post was deleted.' if @post.destroy
     respond_with(@post)
   end
 

app/controllers/registrations_controller.rb

@@ -6,7 +6,7 @@ class RegistrationsController < Devise::RegistrationsController
   prepend_before_action :check_captcha, only: [:create] # Change this to be any actions you want to protect with recaptcha.
 
   def edit
-    @flickr_auth = current_member.auth('flickr')
+    @flickr_auth   = current_member.auth('flickr')
     render "edit"
   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] = t('scientific_names.deleted')
+    flash[:notice] = 'Scientific name was successfully deleted.'
     respond_with(@crop)
   end
 
@@ -74,7 +74,7 @@ class ScientificNamesController < ApplicationController
   end
 
   def scientific_name_params
-    params.require(:scientific_name).permit(:crop_id, :name, :gbif_key, :wikidata_id)
+    params.require(:scientific_name).permit(:crop_id, :name, :gbif_key)
   end
 
   def gbif_service

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] = t('seeds.added_to_stash', crop: @seed.crop) if @seed.save
+    flash[:notice] = "Successfully added #{@seed.crop} seed to your stash." 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] = t('seeds.updated') if @seed.update(seed_params)
+    flash[:notice] = 'Seed was successfully 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] = t('messages.crops_waiting') if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
+      flash[:alert] = "There are crops waiting to be wrangled." if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
     end
   end
 end

app/helpers/application_helper.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'nokogiri'
 module ApplicationHelper
   def parse_date(str)
     str ||= '' # Date.parse barfs on nil
@@ -120,22 +119,4 @@ module ApplicationHelper
   def og_description(description)
     strip_tags(description).split(' ')[0..20].join(' ')
   end
-
-  def github_releases
-    return [] if Rails.env.test?
-
-    feed_url = 'https://github.com/Growstuff/growstuff/releases.atom'
-    Rails.cache.fetch(feed_url, expires_in: 1.day) do
-      response = Faraday.get(feed_url)
-      doc = Nokogiri::XML(response.body)
-      doc.xpath('//xmlns:entry').first(2).map do |entry|
-        {
-          title: entry.xpath('xmlns:title').text,
-          content: entry.xpath('xmlns:content').text,
-          link: entry.xpath('xmlns:link/@href').text,
-          updated: entry.xpath('xmlns:updated').text
-        }
-      end
-    end
-  end
 end

app/helpers/auto_suggest_helper.rb

@@ -13,7 +13,7 @@ module AutoSuggestHelper
     resource = resource.class.name.downcase
     source_path = Rails.application.routes.url_helpers.send("search_#{source}s_path", format: :json)
     %(
-      <input id="#{source}" class="auto-suggest #{options[:class]}" #{'required="required"' if options[:required]}
+      <input id="#{source}" class="auto-suggest #{options[:class]}" #{options[:required] ? 'required="required"' : ''}
         type="text" value="#{default}" data-source-url="#{source_path}",
         placeholder="e.g. lettuce">
       <noscript class="text-warning">

app/helpers/buttons_helper.rb

@@ -85,20 +85,7 @@ module ButtonsHelper
   end
 
   def activity_edit_button(activity, classes: "btn btn-raised btn-info")
-    edit_button(edit_activity_path(slug: activity.slug), classes:)
-  end
-
-  def activity_copy_button(activity, classes: 'btn')
-    link_to new_activity_path(
-      name:        activity.name,
-      description: activity.description,
-      category:    activity.category,
-      garden_id:   activity.garden_id,
-      planting_id: activity.planting_id,
-      due_date:    activity.due_date
-    ), class: classes do
-      copy_icon + ' ' + t('buttons.copy')
-    end
+    edit_button(edit_activity_path(activity), classes:)
   end
 
   def activity_finish_button(activity, classes: 'btn btn-default btn-secondary')

app/helpers/crops_helper.rb

@@ -1,19 +1,6 @@
 # frozen_string_literal: true
 
 module CropsHelper
-  def crop_or_parent(crop, attribute)
-    default = crop.send(attribute)
-    return default if default.present?
-
-    parent = crop
-    while parent = parent.parent
-      return parent.send(attribute) if parent&.send(attribute).present?
-    end
-
-    # For scopes, arrays, etc return the empty value
-    default
-  end
-
   def display_seed_availability(member, crop)
     seeds = member.seeds.where(crop:)
     total_quantity = seeds.where.not(quantity: nil).sum(:quantity)
@@ -30,63 +17,4 @@ module CropsHelper
   def crop_ebay_seeds_url(crop)
     "https://www.ebay.com/sch/i.html?_nkw=#{CGI.escape crop.name}"
   end
-
-  def youtube_video_id(url)
-    return unless url
-
-    regex = %r{(?:youtube(?:-nocookie)?\.com/(?:[^/\n\s]+/\S+/|(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)([a-zA-Z0-9_-]{11})}
-    match = url.match(regex)
-    match[1] if match
-  end
-
-  def crop_jsonld_data(crop, full_attributes: true)
-    same_as_urls = [crop.en_wikipedia_url]
-    crop.scientific_names.each do |scientific_name|
-      same_as_urls << "https://www.wikidata.org/wiki/#{scientific_name.wikidata_id}" if scientific_name.wikidata_id.present?
-    end
-
-    subject_of_entities = []
-    if full_attributes
-      if crop.en_youtube_url.present?
-        subject_of_entities << {
-          '@type': "VideoObject",
-          url:     crop.en_youtube_url
-        }
-      end
-
-      crop.posts.each do |post|
-        subject_of_entities << {
-          '@type': "SocialMediaPosting",
-          url:     post_url(post),
-          author:  {
-            '@type': 'Person',
-            name: post.author.login_name
-          },
-          datePublished: post.created_at
-        }
-      end
-
-      images = []
-      crop.photos.each do |photo|
-        images << photo.fullsize_url
-      end
-    end
-
-    # TODO: Review plantings, seeds, harvests as a subtype of social media post or event that ended? Or creative work?
-    # has_many :plantings, dependent: :destroy
-    # has_many :seeds, dependent: :destroy
-    # has_many :harvests, dependent: :destroy
-
-    {
-      '@context':     "https://schema.org",
-      '@type':        "BioChemEntity",
-      name:           crop.name,
-      taxonomicRange: crop.scientific_names.map(&:name),
-      description:    crop.description,
-      sameAs:         same_as_urls,
-      alternateName:  crop.alternate_names.map(&:name),
-      subjectOf:      subject_of_entities,
-      image:          images
-    }.compact
-  end
 end

app/helpers/event_helper.rb

@@ -7,8 +7,8 @@ module EventHelper
 
   def event_description(event)
     render "#{event.event_type.pluralize}/description", event_model: resolve_model(event)
-  rescue ActionView::MissingTemplate
-    "#{event.event_type.humanize.downcase}d"
+rescue ActionView::MissingTemplate
+  "#{event.event_type.humanize.downcase}d"
   end
 
   def resolve_model(event)

app/helpers/icons_helper.rb

@@ -59,10 +59,6 @@ module IconsHelper
     image_icon 'delete'
   end
 
-  def copy_icon
-    icon('far', 'copy')
-  end
-
   def add_photo_icon
     image_icon 'add-photo'
   end

app/models/ability.rb

@@ -76,7 +76,6 @@ class Ability
     if member.role? :crop_wrangler
       can :wrangle, Crop
       can :manage, Crop
-      can :manage, CropCompanion
       can :manage, ScientificName
       can :manage, AlternateName
       can :openfarm, Crop
@@ -164,12 +163,6 @@ 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,8 +0,0 @@
-# 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

@@ -1,18 +0,0 @@
-# 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,7 +4,6 @@ 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
 
@@ -26,14 +25,4 @@ 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/open_farm_data.rb

@@ -19,6 +19,10 @@ module OpenFarmData
       fetch_attr('tags_array')
     end
 
+    def description
+      fetch_attr('description')
+    end
+
     def common_names
       fetch_attr('common_names')
     end
@@ -39,6 +43,6 @@ module OpenFarmData
   def fetch_attr(key)
     return if openfarm_data.blank?
 
-    openfarm_data.dig('attributes', key)
+    openfarm_data.fetch('attributes', {}).fetch(key, nil)
   end
 end

app/models/concerns/search_harvests.rb

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

app/models/concerns/search_plantings.rb

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

app/models/crop.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Crop < ApplicationRecord
-  has_paper_trail
   extend FriendlyId
   include PhotoCapable
   include OpenFarmData
@@ -28,10 +27,6 @@ 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
 
@@ -57,15 +52,9 @@ class Crop < ApplicationRecord
   validates :en_wikipedia_url,
             format: {
               with:    %r{\Ahttps?://en\.wikipedia\.org/wiki/[[:alnum:]%_.()-]+\z},
-              message: :not_a_valid_wikipedia_url
+              message: 'is not a valid English 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: :not_a_valid_youtube_url
-            },
-            allow_blank: true
   validates :name, uniqueness: { scope: :approval_status }, if: :pending?
 
   def to_s
@@ -101,7 +90,7 @@ class Crop < ApplicationRecord
   def popular_plant_parts
     PlantPart.joins(:harvests)
       .where("crop_id = ?", id)
-      .order(count_harvests_id: :desc)
+      .order("count_harvests_id DESC")
       .group("plant_parts.id", "plant_parts.name")
       .count("harvests.id")
   end
@@ -164,20 +153,8 @@ class Crop < ApplicationRecord
     where(["lower(crops.name) = :value", { value: name.downcase }])
   end
 
-  def all_companions
-    return companions unless parent
-
-    (companions + parent.all_companions).uniq
-  end
-
-  before_destroy :destroy_reverse_companionships
-
   private
 
-  def destroy_reverse_companionships
-    CropCompanion.where(crop_b: self).destroy_all
-  end
-
   def count_uses_of_property(col_name)
     plantings.unscoped
       .where(crop_id: id)
@@ -190,12 +167,12 @@ class Crop < ApplicationRecord
     return if rejected?
     return unless reason_for_rejection.present? || rejection_notes.present?
 
-    errors.add(:approval_status, :rejection_reason_required)
+    errors.add(:approval_status, "must be rejected if a reason for rejection is present")
   end
 
   def must_have_meaningful_reason_for_rejection
     return unless reason_for_rejection == "other" && rejection_notes.blank?
 
-    errors.add(:rejection_notes, :rejection_notes_required)
+    errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
   end
 end

app/models/follow.rb

@@ -4,7 +4,6 @@ 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(
@@ -15,14 +14,4 @@ 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/forum.rb

@@ -3,7 +3,6 @@
 class Forum < ApplicationRecord
   extend FriendlyId
   include Ownable
-
   validates :name, presence: true
   validates :description, presence: true
   friendly_id :name, use: %i(slugged finders)

app/models/garden.rb

@@ -32,7 +32,7 @@ class Garden < ApplicationRecord
 
   validates :name, uniqueness: { scope: :owner_id }
   validates :name,
-            format: { without: /\n/, message: :no_newlines },
+            format: { without: /\n/, message: "must contain 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: :not_a_valid_area_unit },
+                                       message: "%<value>s is 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_garden_owner) if garden.owner == member
+    errors.add(:member_id, "cannot be the garden owner") if garden.owner == member
   end
 
   def member_slug

app/models/garden_type.rb

@@ -2,7 +2,6 @@
 
 class GardenType < ApplicationRecord
   extend FriendlyId
-
   friendly_id :name, use: %i(slugged finders)
 
   has_many :gardens, dependent: :nullify

app/models/harvest.rb

@@ -58,18 +58,18 @@ class Harvest < ApplicationRecord
   ##
   ## Validations
   validates :crop, approved: true
-  validates :crop, presence: { message: :crop_not_found }
-  validates :plant_part, presence: { message: :crop_not_found }
+  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 :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: :not_a_valid_unit
+    in: UNITS_VALUES.values, message: "%<value>s is 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: :not_a_valid_unit
+    in: WEIGHT_UNITS_VALUES.values, message: "%<value>s is 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, :same_crop_required) unless crop == planting.crop
+    errors.add(:planting, "must be the same crop") unless crop == planting.crop
   end
 
   def owner_must_match_planting
@@ -155,13 +155,14 @@ class Harvest < ApplicationRecord
 
     return if owner == planting.owner || planting.garden.garden_collaborators.where(member_id: owner).any?
 
-    errors.add(:owner, :same_owner_required)
+    errors.add(:owner,
+               "of harvest must be the same as planting, or a collaborator on that garden")
   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, :harvest_after_planted) unless harvested_at > planting.planted_at
+    errors.add(:planting, "cannot be harvested before planting") unless harvested_at > planting.planted_at
   end
 end

app/models/like.rb

@@ -5,24 +5,4 @@ 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

@@ -2,14 +2,12 @@
 
 class Member < ApplicationRecord
   include Discard::Model
-
   acts_as_messageable # messages can be sent to this model
   include Geocodable
   include MemberFlickr
   include MemberNewsletter
 
   extend FriendlyId
-
   friendly_id :login_name, use: %i(slugged finders)
 
   #
@@ -52,15 +50,6 @@ 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,
@@ -105,21 +94,20 @@ class Member < ApplicationRecord
   validates :tos_agreement, acceptance: { allow_nil: true, accept: true }
   validates :login_name,
             length:     {
-              minimum: 2, maximum: 25, message: :login_name_length
+              minimum: 2, maximum: 25, message: "should be between 2 and 25 characters long"
             },
             exclusion:  {
-              in: %w(growstuff admin moderator staff nearby), message: :login_name_reserved
+              in: %w(growstuff admin moderator staff nearby), message: "name is reserved"
             },
             format:     {
-              with: /\A\w+\z/, message: :login_name_format
+              with: /\A\w+\z/, message: "may only include letters, numbers, or underscores"
             },
             uniqueness: {
               case_sensitive: false
             }
-  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: :handle_format }, allow_blank: true
+  validates :website_url, format: { with: /\Ahttps?:\/\//, message: "must start with http:// or https://" }, allow_blank: true
+  validates :other_url, format: { with: /\Ahttps?:\/\//, message: "must start with http:// or https://" }, 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
 
   #
   # Triggers
@@ -173,12 +161,12 @@ class Member < ApplicationRecord
   end
 
   def self.nearest_to(place)
-    return [] if place.blank?
-
-    latitude, longitude = Geocoder.coordinates(place, params: { limit: 1 })
-    return [] unless latitude && longitude
-
-    Member.located.near([latitude, longitude], 1000)
+    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
   end
 
   def already_following?(member)
@@ -188,33 +176,4 @@ 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
-
-  def has_activity?
-    (gardens.exists? && gardens.count > 1) ||
-      plantings.exists? ||
-      harvests.exists? ||
-      seeds.exists? ||
-      photos.exists? ||
-      forums.exists? ||
-      activities.exists? ||
-      posts.exists? ||
-      comments.exists? ||
-      requested_crops.exists? ||
-      created_crops.exists? ||
-      likes.exists? ||
-      created_alternate_names.exists? ||
-      created_scientific_names.exists? ||
-      follows.exists? ||
-      inverse_follows.exists? ||
-      blocks.exists? ||
-      inverse_blocks.exists?
-  end
 end

app/models/photo.rb

@@ -47,7 +47,7 @@ class Photo < ApplicationRecord
     info = flickr.photos.getInfo(photo_id: source_id)
     licenses = flickr.photos.licenses.getInfo
     license = licenses.find { |l| l.id.to_i == info.license.to_i }
-    Rails.logger.error("Cannot find license: #{[info.license, licenses].inspect}") unless license
+    Rails.logger.error("Cannot find license: " + [info.license, licenses].inspect) unless license
     {
       title:         calculate_title(info),
       license_name:  license.name,

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, :photo_owner_mismatch) unless photographable.owner_id == photo.owner_id
+    errors.add(:photo, "must have same owner as item it links to") unless photographable.owner_id == photo.owner_id
   end
 
   def crop_present
     return unless %w(Planting Seed Harvest).include?(photographable_type)
 
-    errors.add(:crop_id, :calculate_crop_failed) if crop_id.blank?
+    errors.add(:crop_id, "failed to calculate crop") if crop_id.blank?
   end
 end

app/models/plant_part.rb

@@ -2,7 +2,6 @@
 
 class PlantPart < ApplicationRecord
   extend FriendlyId
-
   friendly_id :name, use: %i(slugged finders)
 
   has_many :harvests, dependent: :destroy

app/models/planting.rb

@@ -25,8 +25,6 @@ class Planting < ApplicationRecord
   has_many :harvests, dependent: :destroy
   has_many :activities, dependent: :destroy
 
-  scope :current, -> { where.not(finished: true).where.not(failed: true) }
-
   #
   # Ancestry of food
   belongs_to :parent_seed, class_name: 'Seed', # parent,
@@ -72,7 +70,7 @@ class Planting < ApplicationRecord
   ##
   ## Validations
   validates :garden, presence: true
-  validates :crop, presence: true, approved: { message: :crop_must_be_approved }
+  validates :crop, presence: true, approved: { message: "must be present and exist in our database" }
   validate :finished_must_be_after_planted
   validate :owner_must_match_garden_owner
   validate :cannot_be_finished_and_failed
@@ -80,10 +78,10 @@ class Planting < ApplicationRecord
     only_integer: true, greater_than_or_equal_to: 0
   }
   validates :sunniness, allow_blank: true, inclusion: {
-    in: SUNNINESS_VALUES, message: :not_a_valid_sunniness
+    in: SUNNINESS_VALUES, message: "%<value>s is not a valid sunniness value"
   }
   validates :planted_from, allow_blank: true, inclusion: {
-    in: PLANTED_FROM_VALUES, message: :not_a_valid_planting_method
+    in: PLANTED_FROM_VALUES, message: "%<value>s is 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,19 +130,20 @@ class Planting < ApplicationRecord
   private
 
   def cannot_be_finished_and_failed
-    errors.add(:failed, :failed_and_finished) if finished && failed
+    errors.add(:failed, "can't be true if planting is also 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, :finished_after_planted) unless planted_at < finished_at
+    errors.add(:finished_at, "must be after the planting date") 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, :same_owner_required)
+    errors.add(:owner,
+               "must be the same as garden, or a collaborator on that garden")
   end
 end

app/models/post.rb

@@ -49,10 +49,9 @@ class Post < ApplicationRecord
 
   # return posts sorted by recent activity
   def self.recently_active
-    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'))
+    Post.order(created_at: :desc).sort do |a, b|
+      b.recent_activity <=> a.recent_activity
+    end
   end
 
   def owner_id

app/models/role.rb

@@ -2,7 +2,6 @@
 
 class Role < ApplicationRecord
   extend FriendlyId
-
   friendly_id :name, use: %i(slugged finders)
   validates :name, uniqueness: true, presence: true
 

app/models/seed.rb

@@ -6,7 +6,6 @@ class Seed < ApplicationRecord
   include Finishable
   include Ownable
   include SearchSeeds
-
   friendly_id :seed_slug, use: %i(slugged finders)
 
   TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally).freeze
@@ -28,7 +27,7 @@ class Seed < ApplicationRecord
   #
   # Validations
   validates :crop, approved: true
-  validates :crop, presence: { message: :crop_not_found }
+  validates :crop, presence: { message: "must be present and exist in our database" }
   validates :quantity, allow_nil:    true,
                        numericality: { only_integer: true, greater_than_or_equal_to: 0 }
   validates :days_until_maturity_min, allow_nil:    true,
@@ -36,15 +35,20 @@ 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: :tradable_to_inclusion }
+                          inclusion:   { in: TRADABLE_TO_VALUES, message: "You may only trade seed nowhere, " \
+                                                                          "locally, nationally, or internationally" }
   validates :organic, allow_blank: false,
-                      inclusion:   { in: ORGANIC_VALUES, message: :organic_inclusion }
+                      inclusion:   { in: ORGANIC_VALUES, message: "You must say whether the seeds " \
+                                                                  "are organic or not, or that you don't know" }
   validates :gmo, allow_blank: false,
-                  inclusion:   { in: GMO_VALUES, message: :gmo_inclusion }
+                  inclusion:   { in: GMO_VALUES, message: "You must say whether the seeds are " \
+                                                          "genetically modified or not, or that you don't know" }
   validates :heirloom, allow_blank: false,
-                       inclusion:   { in: HEIRLOOM_VALUES, message: :heirloom_inclusion }
+                       inclusion:   { in: HEIRLOOM_VALUES, message: "You must say whether the seeds" \
+                                                                    "are heirloom, hybrid, or unknown" }
   validates :source, allow_blank: true,
-                     inclusion:   { in: SOURCE_VALUES, message: :source_inclusion }
+                     inclusion:   { in: SOURCE_VALUES, message: "You must say where the seeds are from," \
+                                                                 "or that you don't know" }
 
   #
   # Delegations

app/resources/api/v1/activity_resource.rb

@@ -7,9 +7,9 @@ module Api
         @model.owner = context[:current_user]
       end
 
-      has_one :owner, class_name: 'Member', always_include_linkage_data: true
-      has_one :garden, always_include_linkage_data: true
-      has_one :planting, always_include_linkage_data: true
+      has_one :owner, class_name: 'Member'
+      has_one :garden
+      has_one :planting
 
       attribute :name
       attribute :description

app/resources/api/v1/crop_resource.rb

@@ -12,7 +12,7 @@ module Api
 
       has_many :photos
 
-      has_one :parent, class_name: 'Crop', always_include_linkage_data: true
+      has_one :parent, class_name: 'Crop'
 
       attribute :name
       attribute :en_wikipedia_url

app/resources/api/v1/garden_resource.rb

@@ -7,7 +7,7 @@ module Api
         @model.owner = context[:current_user]
       end
 
-      has_one :owner, class_name: 'Member', always_include_linkage_data: true
+      has_one :owner, class_name: 'Member'
       has_many :plantings
       has_many :photos
 

app/resources/api/v1/harvest_resource.rb

@@ -10,9 +10,9 @@ module Api
         @model.plant_part = PlantPart.first
       end
 
-      has_one :crop, always_include_linkage_data: true
-      has_one :planting, always_include_linkage_data: true
-      has_one :owner, class_name: 'Member', always_include_linkage_data: true
+      has_one :crop
+      has_one :planting
+      has_one :owner, class_name: 'Member'
       # has_one :plant_part
       has_many :photos
 

app/resources/api/v1/member_resource.rb

@@ -9,7 +9,6 @@ module Api
       has_many :plantings, foreign_key: 'owner_id'
       has_many :harvests, foreign_key: 'owner_id'
       has_many :seeds, foreign_key: 'owner_id'
-      has_many :activities, foreign_key: 'owner_id'
 
       has_many :photos
 

app/resources/api/v1/photo_resource.rb

@@ -8,7 +8,7 @@ module Api
         @model.owner = context[:current_user]
       end
 
-      has_one :owner, class_name: 'Member', always_include_linkage_data: true
+      has_one :owner, class_name: 'Member'
       has_many :plantings
       has_many :gardens
       has_many :harvests

app/resources/api/v1/planting_resource.rb

@@ -7,9 +7,9 @@ module Api
         @model.owner = context[:current_user]
       end
 
-      has_one :garden, always_include_linkage_data: true
-      has_one :crop, always_include_linkage_data: true
-      has_one :owner, class_name: 'Member', always_include_linkage_data: true
+      has_one :garden
+      has_one :crop
+      has_one :owner, class_name: 'Member'
       has_many :photos
       has_many :harvests
 

app/resources/api/v1/seed_resource.rb

@@ -7,8 +7,8 @@ module Api
         @model.owner = context[:current_user]
       end
 
-      has_one :owner, class_name: 'Member', always_include_linkage_data: true
-      has_one :crop, always_include_linkage_data: true
+      has_one :owner, class_name: 'Member'
+      has_one :crop
 
       attribute :description
       attribute :quantity

app/resources/base_resource.rb

@@ -3,7 +3,7 @@
 class BaseResource < JSONAPI::Resource
   abstract
 
-  %i(create update remove).each do |action|
+  [:create, :update, :remove].each do |action|
     set_callback action, :before, :authorize
   end
 

app/services/gbif_service.rb

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

app/views/activities/_actions.haml

@@ -3,7 +3,6 @@
     %a#activity-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
       = activity_edit_button(activity, classes: 'dropdown-item')
-      = activity_copy_button(activity, classes: 'dropdown-item')
       - if activity.active
         = activity_finish_button(activity, classes: 'dropdown-item')
       .dropdown-divider

app/views/activities/_card.html.haml

@@ -10,8 +10,9 @@
             %a.activity-menu.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'}
 
             .dropdown-menu{"aria-labelledby" => "activity-menu"}
-              = activity_edit_button(activity, classes: 'dropdown-item')
-              = activity_copy_button(activity, classes: 'dropdown-item')
+              = link_to edit_activity_path(slug: activity.slug), class: 'dropdown-item' do
+                = edit_icon
+                = t('buttons.edit')
 
               - if activity.active
                 = activity_finish_button(activity, classes: 'dropdown-item')

app/views/activities/_form.html.haml

@@ -17,7 +17,7 @@
 
       .row
         .col-md-12
-          = f.text_field :name, required: true, label: 'What needs to be done?', autofocus: true
+          = f.text_field :name, required: true, label: 'What needs to be done?'
       .row
         .col-md-4
           = f.select(:category, Activity::CATEGORIES, include_blank: true)
@@ -43,14 +43,6 @@
                      value: @activity.due_date ? @activity.due_date.to_fs(:ymd) : '',
                      label: 'When?'
 
-      .row
-        .col-md-6
-          = label_tag :repeat_times, 'Repeat how many times?'
-          = number_field_tag :repeat_times, nil, class: 'form-control'
-        .col-md-6
-          = label_tag :repeat_weeks, 'Every how many weeks?'
-          = number_field_tag :repeat_weeks, nil, class: 'form-control'
-
       %hr
 
       .row

app/views/activities/show.html.haml

@@ -12,7 +12,6 @@
   %li.breadcrumb-item= link_to @activity.owner, member_activities_path(@activity.owner)
   %li.breadcrumb-item.active= link_to @activity.name, @activity
 
-
 .activity
   .row
     .col-md-8.col-xs-12
@@ -23,14 +22,9 @@
             %small.text-muted= @activity.category
           %tt
             = @activity.due_date
-        - if @repeat_link
-          .alert.alert-info
-            Activity marked as finished recently. Would you like to repeat in the near future?
-            = link_to 'Repeat this activity', @repeat_link, class: 'btn btn-secondary btn-sm ml-2'
         - if @activity.description.present?
           :markdown
             #{strip_tags markdownify(@activity.description)}
-
       = render 'likes/likes', object: @activity
       = render 'activities/actions', activity: @activity
 

app/views/admin/crop_companions/index.html.haml

@@ -1,16 +0,0 @@
-%h1= "Companions for #{@crop.name}"
-
-= link_to 'New Companion', new_admin_crop_crop_companion_path(@crop), class: 'btn btn-primary'
-
-%table.table
-  %thead
-    %tr
-      %th Name
-      %th Source URL
-      %th Actions
-  %tbody
-    - @crop_companions.each do |companion|
-      %tr
-        %td= companion.crop_b.name
-        %td= companion.source_url
-        %td= link_to 'Delete', admin_crop_crop_companion_path(@crop, companion), method: :delete, data: { confirm: 'Are you sure?' }

app/views/admin/crop_companions/new.html.haml

@@ -1,6 +0,0 @@
-%h1= "New Companion for #{@crop.name}"
-
-= bootstrap_form_for [:admin, @crop, @crop_companion] do |f|
-  = f.collection_select :crop_b_id, Crop.order(:name), :id, :name, { label: 'Companion' }
-  = f.text_field :source_url, label: 'Source URL'
-  = f.submit 'Create'

app/views/admin/crops/index.html.haml

@@ -1,56 +0,0 @@
-- content_for :title, "Crop Wrangling"
-
-%h1 Crop Wrangling
-
-%nav.nav
-  = link_to "Full crop hierarchy", hierarchy_crops_path, class: 'nav-link'
-  = link_to "Add Crop", new_crop_path, class: 'btn'
-
-%section.crop_wranglers
-  %h2 Crop Wranglers
-  - @crop_wranglers.each do |crop_wrangler|
-    = render 'members/tiny', member: crop_wrangler
-
-%hr/
-
-%section
-  %h2 Crops
-
-
-  %ul#myTab.nav.nav-tabs{role: "tablist"}
-    %li.nav-item
-      %a#home-tab.nav-link{ href: admin_crops_path, role: "tab", class: 'active'}
-        Recently edited
-    %li.nav-item
-      %a#home-tab.nav-link{ href: wrangle_crops_path, role: "tab"}
-        Recently added
-    %li.nav-item
-      %a#profile-tab.nav-link{ href: wrangle_crops_path(approval_status: "pending"), role: "tab"}
-        Pending approval
-    %li.nav-item
-      %a#contact-tab.nav-link{ href: wrangle_crops_path(approval_status: "rejected"), role: "tab"}
-        Rejected
-
-  .card
-    %ul.list-group.list-group-flush
-      - @versions.each do |version|
-        - crop = version.item || version.reify
-        - if crop
-          %li.list-group-item
-            .d-flex.w-100.justify-content-between
-              %h5.mb-1
-                - if version.event == "destroy"
-                  = crop.name
-                - else
-                  = link_to crop.name, crop
-                %small.text-muted= "was #{version.event}d"
-              .d-inline-block
-                %small.mr-2= time_ago_in_words(version.created_at) + " ago"
-                - if can?(:wrangle, Crop)
-                  = link_to "Revert", revert_admin_version_path(version), method: :post, class: "btn btn-sm btn-outline-danger"
-            - member = @members[version.whodunnit.to_i]
-            - if member
-              %p.mb-1
-                Made by
-                = link_to member.name, member
-            = render 'shared/version_changeset', version: version