Merge branch 'dev' into fix-naming

2026-05-25 09:19:15 -04:00 · 2025-09-02 08:41:12 +09:30 · 2025-03-29 14:24:31 +10:30 · 2024-07-13 13:29:09 +09:30 · 2024-03-23 06:57:11 +00:00
319 changed files with 5629 additions and 11914 deletions
--- a/.devcontainer/Dockerfile
+++ b/.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
--- a/.devcontainer/docker-compose.yml
+++ b/.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
--- a/.github/workflows/ci-features-admin.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -100,10 +100,3 @@ jobs:

      - name: Run rspec (admin/)
        run: bundle exec rspec spec/features/admin/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
--- a/.github/workflows/ci-features-comments.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -100,10 +100,3 @@ jobs:

      - name: Run rspec (comments/)
        run: bundle exec rspec spec/features/comments/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
--- a/.github/workflows/ci-features-conversations.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -101,9 +101,3 @@ jobs:
      - name: Run rspec (conversations/)
        run: bundle exec rspec spec/features/conversations/ -fd -t ~@flaky

-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
--- a/.github/workflows/ci-features-crops.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -100,10 +100,3 @@ jobs:

      - name: Run rspec (crops/)
        run: bundle exec rspec spec/features/crops/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
--- a/.github/workflows/ci-features-gardens.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -100,10 +100,3 @@ jobs:

      - name: Run rspec (gardens/)
        run: bundle exec rspec spec/features/gardens/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
--- a/.github/workflows/ci-features-harvests.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -99,11 +99,4 @@ jobs:
        run: bundle exec rails search:reindex

      - name: Run rspec (harvests/)
-        run: bundle exec rspec spec/features/harvests/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
+        run: bundle exec rspec spec/features/harvests/ -fd -t ~@flaky
--- a/.github/workflows/ci-features-home.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -99,11 +99,4 @@ jobs:
        run: bundle exec rails search:reindex

      - name: Run rspec (home/)
-        run: bundle exec rspec spec/features/home/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
+        run: bundle exec rspec spec/features/home/ -fd -t ~@flaky
--- a/.github/workflows/ci-features-members.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -99,11 +99,4 @@ jobs:
        run: bundle exec rails search:reindex

      - name: Run rspec (members/)
-        run: bundle exec rspec spec/features/members/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
+        run: bundle exec rspec spec/features/members/ -fd -t ~@flaky
--- a/.github/workflows/ci-features-places.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -100,10 +100,3 @@ jobs:

      - name: Run rspec (places/)
        run: bundle exec rspec spec/features/places/ -fd
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
--- a/.github/workflows/ci-features-plantings.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -100,10 +100,3 @@ jobs:

      - name: Run rspec (plantings/)
        run: bundle exec rspec spec/features/plantings/ -fd
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
--- a/.github/workflows/ci-features-posts.yml
+++ b/.github/workflows/ci-features-posts.yml
@@ -1,4 +1,4 @@
-name: CI Features - Posts
+name: CI Features - Admin

 on: [pull_request]

@@ -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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -100,10 +100,3 @@ jobs:

      - name: Run rspec (posts/)
        run: bundle exec rspec spec/features/posts/ -fd
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
--- a/.github/workflows/ci-features-seeds.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -100,10 +100,3 @@ jobs:

      - name: Run rspec (seeds/)
        run: bundle exec rspec spec/features/seeds/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
--- a/.github/workflows/ci-features-timeline.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -99,11 +99,4 @@ jobs:
        run: bundle exec rails search:reindex

      - name: Run rspec (timeline/)
-        run: bundle exec rspec spec/features/timeline/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
+        run: bundle exec rspec spec/features/timeline/ -fd -t ~@flaky
--- a/.github/workflows/ci-features.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -108,11 +108,4 @@ jobs:
        run: bundle exec rspec spec/features/photos/ -fd

      - name: Run rspec (rss/)
-        run: bundle exec rspec spec/features/rss/ -fd
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: screenshots
-          path: tmp/screenshots
+        run: bundle exec rspec spec/features/rss/ -fd
--- a/.github/workflows/ci.yml
+++ b/.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@v4
        with:
-          node-version: '24'
+          node-version: '12'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
--- a/.rubocop.yml
+++ b/.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'
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,22 +1,33 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-03-01 05:17:50 UTC using RuboCop version 1.85.0.
+# 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,51 +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: 6
+# 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'
-    - 'spec/requests/api/v1/activities_request_spec.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:
@@ -108,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).
@@ -154,112 +136,62 @@ Lint/SuppressedException:
  Exclude:
    - 'lib/tasks/testing.rake'

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: strict, consistent
-Lint/SymbolConversion:
-  Exclude:
-    - 'app/helpers/crops_helper.rb'
-
 # Offense count: 7
-# This cop supports safe autocorrection (--autocorrect).
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect.
 Lint/UselessAssignment:
  Exclude:
    - 'config.rb'
    - 'config/compass.rb'

-# Offense count: 1
-Lint/UselessConstantScoping:
-  Exclude:
-    - 'app/controllers/members_controller.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: 1
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/ContextMethod:
-  Exclude:
-    - 'spec/requests/api/v1/activities_request_spec.rb'
-
-# Offense count: 299
+# Offense count: 292
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
  Enabled: false

-# Offense count: 1
-# Configuration parameters: IgnoredMetadata.
-RSpec/DescribeClass:
-  Exclude:
-    - 'spec/tasks/import_spec.rb'
-
 # Offense count: 36
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
@@ -272,6 +204,7 @@ RSpec/DescribedClass:

 # Offense count: 13
 # This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect.
 RSpec/EmptyExampleGroup:
  Exclude:
    - 'spec/controllers/authentications_controller_spec.rb'
@@ -294,18 +227,10 @@ RSpec/EmptyLineAfterExample:
  Exclude:
    - 'spec/models/ability_spec.rb'

-# Offense count: 146
+# Offense count: 140
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 27
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: method_call, block
-RSpec/ExpectChange:
-  Exclude:
-    - 'spec/models/crop_spec.rb'
+  Max: 25

 # Offense count: 32
 RSpec/ExpectInHook:
@@ -330,6 +255,7 @@ 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'
@@ -350,12 +276,12 @@ RSpec/IndexedLet:
    - '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

@@ -381,16 +307,16 @@ RSpec/MultipleDescribes:
  Exclude:
    - 'spec/features/crops/crop_wranglers_spec.rb'

-# Offense count: 189
+# Offense count: 152
 RSpec/MultipleExpectations:
  Max: 19

-# Offense count: 166
+# Offense count: 138
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
-  Max: 16
+  Max: 14

-# Offense count: 183
+# Offense count: 133
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
@@ -401,18 +327,17 @@ RSpec/NamedSubject:
 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:
@@ -433,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'
@@ -454,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'
@@ -477,44 +405,36 @@ RSpecRails/HaveHttpStatus:
    - 'spec/controllers/likes_controller_spec.rb'
    - 'spec/requests/harvests_spec.rb'

-# Offense count: 17
+# Offense count: 16
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Inferences.
 RSpecRails/InferredSpecType:
  Enabled: false

-# Offense count: 30
-# Configuration parameters: Database.
+# 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
@@ -525,39 +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: 40
+# Offense count: 33
 Rails/I18nLocaleTexts:
  Enabled: false

-# Offense count: 1
-# Configuration parameters: IgnoreScopes.
-Rails/InverseOf:
-  Exclude:
-    - 'app/models/member.rb'
-
-# 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'

@@ -573,16 +492,10 @@ 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'
@@ -600,7 +513,7 @@ 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'

@@ -613,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'
@@ -629,44 +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: 4
-# Configuration parameters: ForbiddenMethods, AllowedMethods.
-# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
-Rails/SkipsModelValidations:
-  Exclude:
-    - 'db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb'
-    - 'db/migrate/20240810160538_set_default_language_for_existing_alternate_names.rb'
-    - 'db/migrate/20251128200506_add_description_to_crops.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'
@@ -684,34 +583,24 @@ Rails/WhereEquals:
    - 'app/models/harvest.rb'
    - 'app/models/planting.rb'

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Rails/WhereMissing:
-  Exclude:
-    - 'app/controllers/crops_controller.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'
@@ -726,51 +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: 22
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
-  Enabled: false
+  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).
@@ -792,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'
@@ -809,21 +676,13 @@ 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
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'db/migrate/20251130035700_create_versions.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Methods.
@@ -838,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'
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.4.8
+3.3.8
--- a/.travis.yml
+++ b/.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
--- a/20
+++ b/20
@@ -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'
--- a/Gemfile.lock
+++ b/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.2)
    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.3)
    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)
+    factory_bot (6.5.4)
      activesupport (>= 6.1.0)
-    factory_bot_rails (6.5.1)
+    factory_bot_rails (6.5.0)
      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.1)
+    pg (1.6.1-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 (6.6.1)
      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.1)
      json (~> 2.3)
      language_server-protocol (~> 3.17.0.2)
      lint_roller (~> 1.1.0)
-      parallel (>= 1.10)
+      parallel (~> 1.10)
      parser (>= 3.3.0.2)
      rainbow (>= 2.2.2, < 4.0)
      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.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.6.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
--- a/README.md
+++ b/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
--- a/app/assets/images/girlwithvegetables-0038331hotifw.svg
+++ b/app/assets/images/girlwithvegetables-0038331hotifw.svg
--- a/app/assets/stylesheets/_homepage.scss
+++ b/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;
-      }
-    }
-  }
-}
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -33,4 +33,4 @@

@view-transition {
  navigation: auto;
-}
+}
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -132,8 +132,6 @@ section {
    border-radius: 5%;
    margin: 0.5em 0.5em 0.5em 0;
    width: 200px;
-    align-items: stretch;
-    justify-content: space-between;

    .img-card {
      border-top-left-radius: 5%;
--- a/app/controllers/activities_controller.rb
+++ b/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

--- a/app/controllers/admin/crop_companions_controller.rb
+++ b/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: 'Companion was successfully 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: 'Companion was successfully destroyed.'
-    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
--- a/app/controllers/admin/crops_controller.rb
+++ b/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
--- a/app/controllers/admin/versions_controller.rb
+++ b/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: "Reverted to version from #{@version.created_at.strftime('%B %d, %Y')}"
-      else
-        redirect_to admin_crops_path, alert: "Could not revert to version from #{@version.created_at.strftime('%B %d, %Y')}. Errors: #{@object.errors.full_messages.to_sentence}"
-      end
-    end
-
-    private
-
-    def authorize_admin!
-      authorize! :wrangle, Crop
-    end
-  end
-end
--- a/app/controllers/api/v1/activities_controller.rb
+++ b/app/controllers/api/v1/activities_controller.rb
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  module V1
-    class ActivitiesController < BaseController
-    end
-  end
-end
--- a/app/controllers/api/v1/base_controller.rb
+++ b/app/controllers/api/v1/base_controller.rb
@@ -4,40 +4,6 @@ module Api
  module V1
    class BaseController < JSONAPI::ResourceController
      abstract
-      protect_from_forgery with: :null_session
-      before_action :authenticate_member_from_token!
-      before_action :enforce_member_for_write_operations!, only: %i(create update destroy)
-      rescue_from CanCan::AccessDenied do
-        head :forbidden
-      end
-
-      def context
-        {
-          current_user:    current_user,
-          current_ability: current_ability,
-          controller:      self,
-          action:          params[:action]
-        }
-      end
-
-      private
-
-      attr_reader :current_user
-
-      def enforce_member_for_write_operations!
-        head :unauthorized unless current_user
-      end
-
-      def authenticate_member_from_token!
-        authenticate_with_http_token do |token, _options|
-          auth = Authentication.find_by(token: token, provider: 'api')
-          if auth.present?
-            @current_user = auth.member
-
-            return true
-          end
-        end
-      end
    end
  end
 end
--- a/app/controllers/crops_controller.rb
+++ b/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.left_joins(:alternate_names).where(alternate_names: { id: nil }).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,14 +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)
    )
  end
--- a/app/controllers/follows_controller.rb
+++ b/app/controllers/follows_controller.rb
@@ -17,7 +17,7 @@ class FollowsController < ApplicationController
    else
      flash[:error] = "Already following or error while following."
    end
-    redirect_back_or_to(root_path)
+    redirect_back fallback_location: root_path
  end

  def destroy
--- a/app/controllers/gardens_controller.rb
+++ b/app/controllers/gardens_controller.rb
@@ -20,7 +20,6 @@ class GardensController < DataController
  def show
    @current_plantings = @garden.plantings.current.where.not(failed: true).includes(:crop, :owner).order(planted_at: :desc)
    @current_activities = @garden.activities.current.includes(:owner).order(created_at: :desc)
-    @finished_activities = @garden.activities.finished.includes(:owner).order(created_at: :desc)
    @finished_plantings = @garden.plantings.finished.includes(:crop)
    @suggested_companions = Crop.approved.where(
      id: CropCompanion.where(crop_a_id: @current_plantings.select(:crop_id)).select(:crop_b_id)
@@ -39,10 +38,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

--- a/app/controllers/home_controller.rb
+++ b/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
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -37,7 +37,6 @@ class PlantingsController < DataController
    @photos = @planting.photos.includes(:owner).order(date_taken: :desc)
    @harvests = Harvest.search(where: { planting_id: @planting.id })
    @current_activities = @planting.activities.current.includes(:owner).order(created_at: :desc)
-    @finished_activities = @planting.activities.finished.includes(:owner).order(created_at: :desc)
    @matching_seeds = matching_seeds
    @crop = @planting.crop

@@ -46,12 +45,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

--- a/app/controllers/registrations_controller.rb
+++ b/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

@@ -38,12 +38,6 @@ class RegistrationsController < Devise::RegistrationsController
    end
  end

-  def regenerate_api_token
-    current_member.regenerate_api_token
-    set_flash_message :notice, :api_token_regenerated
-    redirect_to edit_member_registration_path + '#apps'
-  end
-
  def destroy
    if @member.valid_password?(params.require(:member)[:current_password])
      @member.discard
--- a/app/controllers/scientific_names_controller.rb
+++ b/app/controllers/scientific_names_controller.rb
@@ -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
--- a/app/helpers/application_helper.rb
+++ b/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
@@ -22,28 +21,6 @@ module ApplicationHelper
    classes
  end

-  # Similar to Rails' time_ago_in_words, but gives a more standard
-  # output like "in 3 days" or "5 months ago".
-  # Also handles the case where from_time is a Date and to_time is a Date
-  # (in which case it just says "today" if they're the same date).
-  #
-  # NOTE: This is similar to distance_of_time_in_words but different enough
-  # that I think it's worth having a separate helper for it.
-  #
-  # from_time - the starting time (Time or Date)
-  # to_time - the ending time (Time or Date). Default: now (Time.zone.now)
-  # include_seconds - whether to include seconds in the calculation
-  #
-  # Returns a string like "in 3 days" or "5 months ago"
-  def standard_time_distance(from_time, to_time = 0, include_seconds = false)
-    return 'today' if from_time.is_a?(Date) && (from_time == to_time)
-
-    return 'now' if from_time == to_time
-    return "#{distance_of_time_in_words(from_time, to_time, include_seconds:)} ago" if from_time < to_time
-
-    "in #{distance_of_time_in_words(from_time, to_time, include_seconds:)}"
-  end
-
  def count_github_contibutors
    File.open(Rails.root.join('CONTRIBUTORS.md')).readlines.grep(/^-/).size
  end
@@ -120,22 +97,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
--- a/app/helpers/auto_suggest_helper.rb
+++ b/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">
--- a/app/helpers/buttons_helper.rb
+++ b/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')
--- a/app/helpers/crops_helper.rb
+++ b/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
--- a/app/helpers/event_helper.rb
+++ b/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)
--- a/app/helpers/icons_helper.rb
+++ b/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
--- a/app/models/ability.rb
+++ b/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
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -30,20 +30,4 @@ class Activity < ApplicationRecord
  def to_s
    name
  end
-
-  def garden_name
-    garden&.name
-  end
-
-  def garden_slug
-    garden&.slug
-  end
-
-  def planting_name
-    planting&.crop&.name
-  end
-
-  def planting_slug
-    planting&.crop&.slug
-  end
 end
--- a/app/models/australian_food_classification_data.rb
+++ b/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
--- a/app/models/concerns/open_farm_data.rb
+++ b/app/models/concerns/open_farm_data.rb
@@ -8,6 +8,14 @@ module OpenFarmData
      fetch_attr('main_image_path')
    end

+    def height
+      fetch_attr('height')
+    end
+
+    def spread
+      fetch_attr('spread')
+    end
+
    def svg_icon
      icon = fetch_attr('svg_icon')
      return icon if icon.present?
@@ -19,6 +27,14 @@ module OpenFarmData
      fetch_attr('tags_array')
    end

+    def description
+      fetch_attr('description')
+    end
+
+    def row_spacing
+      fetch_attr('row_spacing')
+    end
+
    def common_names
      fetch_attr('common_names')
    end
@@ -27,10 +43,22 @@ module OpenFarmData
      fetch_attr('binomial_name')
    end

+    def sowing_method
+      fetch_attr('sowing_method')
+    end
+
    def main_image_path
      fetch_attr('main_image_path')
    end

+    def sun_requirements
+      fetch_attr('sun_requirements')
+    end
+
+    def growing_degree_days
+      fetch_attr('growing_degree_days')
+    end
+
    def processing_pictures
      fetch_attr('processing_pictures')
    end
@@ -39,6 +67,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
--- a/app/models/concerns/search_activities.rb
+++ b/app/models/concerns/search_activities.rb
@@ -9,9 +9,7 @@ module SearchActivities
               mappings:       {
                 properties: {
                   active:     { type: :boolean },
-                   created_at: { type: :integer },
-                   updated_at: { type: :integer },
-                   due_date:   { type: :date }
+                   created_at: { type: :integer }
                 }
               }

@@ -25,10 +23,8 @@ module SearchActivities
        category:,
        garden_id:,
        garden_name:      garden&.name,
-        garden_slug:      garden&.garden_slug,
        planting_id:,
        planting_name:    planting&.crop&.name,
-        planting_slug:    planting&.slug,
        description:,

        # owner
--- a/app/models/concerns/search_harvests.rb
+++ b/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('*',
--- a/app/models/concerns/search_plantings.rb
+++ b/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('*',
--- a/app/models/crop.rb
+++ b/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

@@ -60,12 +55,6 @@ class Crop < ApplicationRecord
              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: 'is 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)
--- a/app/models/forum.rb
+++ b/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)
--- a/app/models/garden_type.rb
+++ b/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
--- a/app/models/harvest.rb
+++ b/app/models/harvest.rb
@@ -53,7 +53,6 @@ class Harvest < ApplicationRecord

  delegate :name, :slug, to: :crop, prefix: true
  delegate :login_name, :slug, to: :owner, prefix: true
-  delegate :name, to: :plant_part, prefix: true

  ##
  ## Validations
@@ -109,7 +108,7 @@ class Harvest < ApplicationRecord
  def to_s
    # 50 individual apples, weighing 3lb
    # 2 buckets of apricots, weighing 10kg
-    "#{quantity_to_human} #{unit_to_human} #{crop_name_to_human} #{weight_to_human}".strip
+    "#{quantity_to_human} #{unit_to_human} #{plant_part_name_to_human} of #{crop_name} #{weight_to_human}".strip
  end

  def quantity_to_human
@@ -132,13 +131,13 @@ class Harvest < ApplicationRecord
    "weighing #{number_to_human(weight_quantity, strip_insignificant_zeros: true)} #{weight_unit}"
  end

-  def crop_name_to_human
+  def plant_part_name_to_human
    if unit != 'individual' # buckets of apricot*s*
-      crop.name.pluralize
+       plant_part.name.pluralize
    elsif quantity == 1
-      crop.name
+      plant_part.name
    else
-      crop.name.pluralize
+      plant_part.name.pluralize
    end.to_s
  end

--- a/app/models/member.rb
+++ b/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)

  #
@@ -26,20 +24,6 @@ class Member < ApplicationRecord
  has_many :notifications, foreign_key: 'recipient_id', inverse_of: :recipient
  has_many :sent_notifications, foreign_key: 'sender_id', inverse_of: :sender, class_name: "Notification"
  has_many :authentications, dependent: :destroy
-  has_one :api_token, -> { where(provider: 'api') }, class_name: 'Authentication', dependent: :destroy
-
-  def api_token?
-    api_token.present?
-  end
-
-  def regenerate_api_token
-    api_token.destroy if api_token?
-    create_api_token(
-      provider: 'api',
-      uid:      id,
-      token:    SecureRandom.hex(16)
-    )
-  end
  has_many :photos, inverse_of: :owner
  has_many :likes, dependent: :destroy

@@ -107,10 +91,9 @@ class Member < ApplicationRecord
            uniqueness: {
              case_sensitive: false
            }
-  validates :website_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
-  validates :other_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
-  validates :instagram_handle, :facebook_handle, :bluesky_handle,
-            format: { without: %r{\Ahttps?://|/}, message: "should be a handle, not a URL" }, 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
--- a/app/models/photo.rb
+++ b/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,
--- a/app/models/plant_part.rb
+++ b/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
@@ -12,6 +11,10 @@ class PlantPart < ApplicationRecord

  scope :joins_members, -> { joins("INNER JOIN members ON members.id = harvests.owner_id") }

+  def whole_plant?
+    name == 'whole plant'
+  end
+
  def to_s
    name
  end
--- a/app/models/planting.rb
+++ b/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,
--- a/app/models/role.rb
+++ b/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

--- a/app/models/seed.rb
+++ b/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
@@ -49,7 +48,7 @@ class Seed < ApplicationRecord
                                                                    "are heirloom, hybrid, or unknown" }
  validates :source, allow_blank: true,
                     inclusion:   { in: SOURCE_VALUES, message: "You must say where the seeds are from," \
-                                                                "or that you don't know" }
+                                                                 "or that you don't know" }

  #
  # Delegations
--- a/app/resources/api/v1/activity_resource.rb
+++ b/app/resources/api/v1/activity_resource.rb
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  module V1
-    class ActivityResource < BaseResource
-      before_create do
-        @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
-
-      attribute :name
-      attribute :description
-      attribute :category
-      attribute :finished
-      attribute :due_date
-
-      filter :owner
-      filter :owner_id
-      filter :garden
-      filter :garden_id
-      filter :planting
-      filter :planting_id
-      filter :category
-    end
-  end
-end
--- a/app/resources/api/v1/crop_resource.rb
+++ b/app/resources/api/v1/crop_resource.rb
@@ -3,7 +3,8 @@
 module Api
  module V1
    class CropResource < BaseResource
-      immutable # TODO: Re-evaluate this later
+      immutable
+
      filter :approval_status, default: 'approved'

      has_many :plantings
@@ -12,7 +13,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
--- a/app/resources/api/v1/garden_resource.rb
+++ b/app/resources/api/v1/garden_resource.rb
@@ -3,22 +3,13 @@
 module Api
  module V1
    class GardenResource < BaseResource
-      before_create do
-        @model.owner = context[:current_user]
-      end
+      immutable

-      has_one :owner, class_name: 'Member', always_include_linkage_data: true
+      has_one :owner, class_name: 'Member'
      has_many :plantings
      has_many :photos

      attribute :name
-
-      filter :owner
-      filter :owner_id
-      filter :active
-      filter :garden_type
-      filter :location
-      filter :slug
    end
  end
 end
--- a/app/resources/api/v1/harvest_resource.rb
+++ b/app/resources/api/v1/harvest_resource.rb
@@ -3,17 +3,11 @@
 module Api
  module V1
    class HarvestResource < BaseResource
-      before_save do
-        @model.owner = context[:current_user]
-        @model.crop_id = @model.planting.crop_id if @model.planting_id
-        @model.harvested_at = Time.zone.now if @model.harvested_at.blank?
-        @model.plant_part = PlantPart.first
-      end
+      immutable

-      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 :plant_part
+      has_one :crop
+      has_one :planting
+      has_one :owner, class_name: 'Member'
      has_many :photos

      attribute :harvested_at
@@ -22,15 +16,6 @@ module Api
      attribute :weight_quantity
      attribute :weight_unit
      attribute :si_weight
-
-      filter :owner
-      filter :owner_id
-      filter :crop
-      filter :crop_id
-      filter :planting
-      filter :planting_id
-      filter :plant_part
-      filter :harvested_at
    end
  end
 end
--- a/app/resources/api/v1/member_resource.rb
+++ b/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

--- a/app/resources/api/v1/photo_resource.rb
+++ b/app/resources/api/v1/photo_resource.rb
@@ -3,12 +3,9 @@
 module Api
  module V1
    class PhotoResource < BaseResource
-      immutable # TODO: Re-evaluate this.
-      before_create do
-        @model.owner = context[:current_user]
-      end
+      immutable

-      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
--- a/app/resources/api/v1/planting_resource.rb
+++ b/app/resources/api/v1/planting_resource.rb
@@ -3,13 +3,11 @@
 module Api
  module V1
    class PlantingResource < BaseResource
-      before_create do
-        @model.owner = context[:current_user]
-      end
+      immutable

-      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

@@ -38,10 +36,6 @@ module Api
      filter :owner
      filter :owner_id
      filter :finished
-      filter :active, apply: ->(records, _value, _options) { records.active }
-      filter :failed, apply: ->(records, _value, _options) { records.failed }
-      filter :sunniness
-      filter :perennial, apply: ->(records, _value, _options) { records.perennial }

      attribute :percentage_grown
      delegate :percentage_grown, to: :@model
--- a/app/resources/api/v1/seed_resource.rb
+++ b/app/resources/api/v1/seed_resource.rb
@@ -3,12 +3,10 @@
 module Api
  module V1
    class SeedResource < BaseResource
-      before_create do
-        @model.owner = context[:current_user]
-      end
+      immutable

-      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
@@ -19,15 +17,6 @@ module Api
      attribute :organic
      attribute :gmo
      attribute :heirloom
-
-      filter :owner
-      filter :owner_id
-      filter :crop
-      filter :crop_id
-      filter :tradable_to
-      filter :organic
-      filter :gmo
-      filter :heirloom
    end
  end
 end
--- a/app/resources/base_resource.rb
+++ b/app/resources/base_resource.rb
@@ -1,16 +1,6 @@
 # frozen_string_literal: true

 class BaseResource < JSONAPI::Resource
+  immutable
  abstract
-
-  %i(create update remove).each do |action|
-    set_callback action, :before, :authorize
-  end
-
-  # Check authorisation for write operations.
-  # NOTE: At a later time, we may require API tokens for READ operations.
-  def authorize
-    # context[:action] is simply context[:controller].params[:action]
-    context[:current_ability].authorize! context[:action].to_sym, @model
-  end
 end
--- a/app/views/activities/_actions.haml
+++ b/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
--- a/app/views/activities/_card.html.haml
+++ b/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')
@@ -19,24 +20,16 @@
              - if can? :destroy, activity
                .dropdown-divider
                = delete_button(activity, classes: 'dropdown-item text-danger')
-    .card-body
-      = link_to activity_path(slug: activity.slug) do
+    = link_to activity_path(slug: activity.slug) do
+      .card-body.text-center
        %h4= activity.name
-        - if activity.due_date
-          %small.due-date{title: activity.due_date}
-            = standard_time_distance(activity.due_date.to_date, Time.zone.now.to_date)
-        %div
-          %small.text-justify{title: activity.description}= activity.description.truncate(150)
-      %p
-        %ul.list-unstyled
-        - if activity.garden_name && activity.garden_slug
-          %li
-            %small= link_to activity.garden_name, garden_path(slug: activity.garden_slug)
-        - if activity.planting_name && activity.planting_slug
-          %li
-            %small= link_to activity.planting_name, planting_path(slug: activity.planting_slug)
-
+        .text-center= activity.description
+        - if activity.garden
+          .text-center= activity.garden
+        - if activity.planting
+          .text-center= activity.planting
    .card-footer
-      %small.chip.member-chip
-        = link_to member_path(slug: activity.owner_slug) do
-          = activity.owner_login_name
+      .float-right
+        %span.chip.member-chip
+          = link_to member_path(slug: activity.owner_slug) do
+            = activity.owner_login_name
--- a/app/views/activities/_form.html.haml
+++ b/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)
@@ -27,13 +27,13 @@

      .row
        .col-md-4
-          = f.collection_radio_buttons(:garden_id, @activity.owner.gardens.active.order_by_name,
+          = f.collection_radio_buttons(:garden_id, @activity.owner.gardens.active,
            :id, :name,
            label: 'Is this for a specific garden?')
          = link_to "Add a garden.", new_garden_path

        .col-md-4
-          = f.collection_radio_buttons(:planting_id, @activity.owner.plantings.active.recent,
+          = f.collection_radio_buttons(:planting_id, @activity.owner.plantings.active,
            :id, :crop_name,
            label: 'Is this for a specific planting?')
          = link_to "Add a planting.", new_planting_path
@@ -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
--- a/app/views/activities/show.html.haml
+++ b/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

--- a/app/views/admin/crop_companions/index.html.haml
+++ b/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?' }
--- a/app/views/admin/crop_companions/new.html.haml
+++ b/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'
--- a/app/views/admin/crops/index.html.haml
+++ b/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
--- a/app/views/comments/index.html.haml
+++ b/app/views/comments/index.html.haml
@@ -1,13 +0,0 @@
- content_for :title, "Comments"
- content_for :meta_description, "Browse and search for comments."
- content_for :breadcrumbs do
-  %li.breadcrumb-item.active= link_to "Comments", comments_path
-
-%h1 Comments
-
-= will_paginate @comments
-
- @comments.each do |comment|
-  = render 'single', comment: comment
-
-= will_paginate @comments
--- a/app/views/crops/_crop_list.html.haml
+++ b/app/views/crops/_crop_list.html.haml
@@ -1,10 +0,0 @@
-%table.table.table-striped
-  %thead
-    %tr
-      %th Name
-      %th Plantings
-  %tbody
-    - crops.each do |crop|
-      %tr
-        %td= link_to crop.name, crop
-        %td= crop.plantings_count
--- a/app/views/crops/_form.html.haml
+++ b/app/views/crops/_form.html.haml
@@ -41,47 +41,11 @@
        = f.radio_button(:perennial, true, label: "Perennial")
        %span.help-block Living more than two years

-      %h2 Data
-      - if @crop.description.blank? || can?(:wrangle, @crop)
-        = f.text_area :description, label: 'Description'
-        - if @crop.parent
-          %span.help-block Parent: #{@crop.parent.description}
-      - if @crop.row_spacing.blank? || can?(:wrangle, @crop)
-        = f.number_field :row_spacing, label: 'Row Spacing (cm)', min: 0
-        - if @crop.parent
-          %span.help-block Parent: #{@crop.parent.row_spacing}
-      - if @crop.spread.blank? || can?(:wrangle, @crop)
-        = f.number_field :spread, label: 'Spread (cm)', min: 0
-        - if @crop.parent
-          %span.help-block Parent: #{@crop.parent.spread}
-      - if @crop.height.blank? || can?(:wrangle, @crop)
-        = f.number_field :height, label: 'Height (cm)', min: 0
-        - if @crop.parent
-          %span.help-block Parent: #{@crop.parent.height}
-      - if @crop.sowing_method.blank? || can?(:wrangle, @crop)
-        = f.text_field :sowing_method
-        - if @crop.parent
-          %span.help-block Parent: #{@crop.parent.sowing_method}
-      - if @crop.sun_requirements.blank? || can?(:wrangle, @crop)
-        = f.text_field :sun_requirements
-        - if @crop.parent
-          %span.help-block Parent: #{@crop.parent.sun_requirements}
-      - if @crop.growing_degree_days.blank? || can?(:wrangle, @crop)
-        = f.number_field :growing_degree_days, min: 0
-        - if @crop.parent
-          %span.help-block Parent: #{@crop.parent.growing_degree_days}
-      = f.text_field :public_food_key, label: 'Australian Food Composition Database Public Food Key'
-
      - unless @crop.approved?
        = link_to 'Search wikipedia', "https://en.wikipedia.org/w/index.php?search=#{@crop.name}", target: '_blank'
-      - if @crop.en_wikipedia_url.blank? || can?(:wrangle, @crop)
-        = f.url_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
-        %span.help-block
-          Link to the crop's page on the English language Wikipedia (required).
-      - if @crop.en_youtube_url.blank? || can?(:wrangle, @crop)
-        = f.url_field :en_youtube_url, label: 'YouTube URL'
-        %span.help-block
-          Link to a YouTube video about the crop in English.
+      = f.url_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
+      %span.help-block
+        Link to the crop's page on the English language Wikipedia (required).

      -# Only crop wranglers see the crop hierarchy (for now)
      - if can? :wrangle, @crop
--- a/app/views/crops/_harvests.html.haml
+++ b/app/views/crops/_harvests.html.haml
@@ -12,7 +12,7 @@
            #{harvest.owner} harvested #{display_quantity(harvest)}.
          .float-right= render 'members/location', member: harvest.owner
          .harvest-timeago
-            %small #{standard_time_distance(harvest.harvested_at, Time.zone.now.to_date)}
+            %small #{distance_of_time_in_words(harvest.harvested_at, Time.zone.now)} ago.
      %li.list-group-item= link_to "View all #{crop.name} harvests", crop_harvests_path(crop), class: 'card-link'
      - if crop.approved?
        - if current_member
--- a/app/views/crops/_history.html.haml
+++ b/app/views/crops/_history.html.haml
@@ -1,16 +0,0 @@
-%section.history
-  %h2 History
-  .card
-    %ul.list-group.list-group-flush
-      - crop.versions.reorder(created_at: :desc).each do |version|
-        - if version.changeset.present?
-          %li.list-group-item
-            .d-flex.w-100.justify-content-between
-              %h5.mb-1= version.event.humanize
-              %small= time_ago_in_words(version.created_at) + " ago"
-            - member = @version_members.present? && @version_members[version.whodunnit.to_i]
-            - if member
-              %p.mb-1
-                Made by
-                = link_to member.name, member
-            = render 'shared/version_changeset', version: version
--- a/app/views/crops/_info.haml
+++ b/app/views/crops/_info.haml
@@ -6,14 +6,14 @@
      - unless @crop.approved?
        %badge.badge-warning=@crop.approval_status
      %small.text-muted= @crop.default_scientific_name
-    - if crop_or_parent(@crop, :sowing_method).present?
+    - if @crop.sowing_method.present?
      %p
        %strong How to sow #{@crop.name}:
-        = crop_or_parent(@crop, :sowing_method)
-    - if crop_or_parent(@crop, :sun_requirements).present?
+        = @crop.sowing_method
+    - if @crop.sun_requirements.present?
      %p
        %strong Sun requirement for #{@crop}:
-        Plant in #{crop_or_parent(@crop, :sun_requirements)}
+        Plant in #{@crop.sun_requirements}
    %p.text-muted
      - if !@crop.plantings.empty?
        #{@crop.name.titleize} has been planted
@@ -21,11 +21,8 @@
        by #{ENV['GROWSTUFF_SITE_NAME']} members.
      - else
        Nobody is growing this yet. You could be the first!
-    - if crop_or_parent(@crop, :description).present?
-      %p= simple_format crop_or_parent(@crop, :description)
-    - else
-      - if member_signed_in?
-        %p= link_to "Add a description.", edit_crop_path(@crop, anchor: ":~:text=Description")
+    - if @crop.description.present?
+      %p= simple_format @crop.description
  .col-md-3
    = image_tag crop_image_path(@crop),
      class: 'img-responsive shadow rounded crop-hero-photo', alt: "Image of #{@crop.name}"
--- a/app/views/crops/_nutritional_data.html.haml
+++ b/app/views/crops/_nutritional_data.html.haml
@@ -1,38 +0,0 @@
- data = crop.australian_food_classification_data
- if data
-  .card
-    .card-body
-      %h4.card-title Nutritional Data
-      %p.card-text A summary of nutritional data per 100g for #{data.food_name}.
-      %table.table.table-sm.table-borderless
-        %tbody
-          - if data.energy_with_dietary_fibre_equated_kj.to_f > 0
-            %tr
-              %th Energy
-              %td= "#{data.energy_with_dietary_fibre_equated_kj.to_f.round(1)} kJ"
-          - if data.protein_g.to_f > 0
-            %tr
-              %th Protein
-              %td= "#{data.protein_g.to_f.round(1)} g"
-          - if data.fat_total_g.to_f > 0
-            %tr
-              %th Fat, total
-              %td= "#{data.fat_total_g.to_f.round(1)} g"
-          - if data.available_carbohydrate_with_sugar_alcohols_g.to_f > 0
-            %tr
-              %th Carbohydrate
-              %td= "#{data.available_carbohydrate_with_sugar_alcohols_g.to_f.round(1)} g"
-          - if data.total_sugars_g.to_f > 0
-            %tr
-              %th - Sugars
-              %td= "#{data.total_sugars_g.to_f.round(1)} g"
-          - if data.total_dietary_fibre_g.to_f > 0
-            %tr
-              %th Fibre
-              %td= "#{data.total_dietary_fibre_g.to_f.round(1)} g"
-          - if data.sodium_na_mg.to_f > 0
-            %tr
-              %th Sodium
-              %td= "#{data.sodium_na_mg.to_f.round(1)} mg"
-    .card-footer
-      = link_to "See more", "https://www.foodstandards.gov.au/science-data/food-nutrient-databases/afcd/search/food/#{data.public_food_key}", target: "_blank", rel: "noopener noreferrer"
--- a/app/views/crops/_openfarm_data.html.haml
+++ b/app/views/crops/_openfarm_data.html.haml
@@ -1,33 +0,0 @@
- if crop.row_spacing || crop.spread || crop.height || crop.sowing_method || crop.sun_requirements || crop.growing_degree_days
-  = cute_icon
-  .card
-    .card-body
-      %h4 OpenFarm Data
-    %ul.list-group.list-group-flush
-      - if crop.row_spacing
-        %li.list-group-item
-          %strong Row Spacing:
-          = crop.row_spacing
-          cm
-      - if crop.spread
-        %li.list-group-item
-          %strong Spread:
-          = crop.spread
-          cm
-      - if crop.height
-        %li.list-group-item
-          %strong Height:
-          = crop.height
-          cm
-      - if crop.sowing_method
-        %li.list-group-item
-          %strong Sowing Method:
-          = crop.sowing_method
-      - if crop.sun_requirements
-        %li.list-group-item
-          %strong Sun Requirements:
-          = crop.sun_requirements
-      - if crop.growing_degree_days
-        %li.list-group-item
-          %strong Growing Degree Days:
-          = crop.growing_degree_days
--- a/app/views/crops/_photos.html.haml
+++ b/app/views/crops/_photos.html.haml
@@ -1,7 +1,7 @@
 %h2 #{photo_icon} Photos
 - [Crop, Planting, Harvest, Seed].each do |model_name|
-  - if crop_or_parent(crop, :photos).by_model(model_name).any?
+  - if crop.photos.by_model(model_name).any?
    %h3 #{@crop.name.capitalize} #{t("activerecord.models.#{model_name.to_s.downcase}.other")}
-    = render 'photos/gallery', photos: crop_or_parent(crop, :photos).by_model(model_name).includes(:owner).order(likes_count: :desc).limit(5)
+    = render 'photos/gallery', photos: crop.photos.by_model(model_name).includes(:owner).order(likes_count: :desc).limit(5)
 - if crop.photos.count.positive?
  = link_to 'more photos »', crop_photos_path(@crop), class: 'btn'
--- a/app/views/crops/_predictions.html.haml
+++ b/app/views/crops/_predictions.html.haml
@@ -54,7 +54,3 @@
  - if crop.growing_degree_days.present?
    = render 'layouts/fact_card',
      title: 'Growing Degree Days', value: crop.growing_degree_days, description: nil
-  - if member_signed_in? && (!crop.height.present? || !crop.spread.present? || !crop.row_spacing.present? || !crop.growing_degree_days.present?)
-    .card.fact-card
-      .card-body.text-center
-        %p= link_to "Add more attributes.", edit_crop_path(@crop, anchor: ":~:text=Data")
--- a/app/views/crops/_schema_org.html.haml
+++ b/app/views/crops/_schema_org.html.haml
@@ -1,2 +0,0 @@
-%script{type: "application/ld+json"}
-  = crop_jsonld_data(crop).to_json.html_safe
--- a/app/views/crops/_scientific_names.html.haml
+++ b/app/views/crops/_scientific_names.html.haml
@@ -4,28 +4,25 @@
    %p None known.
  - else
    - crop.scientific_names.each do |sn|
-      .d-inline-block
-        - if can? :edit, sn
-          .dropdown.planting-actions.d-inline-block
-            %a#planting-actions-scinames.dropdown-toggle.card-link{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button", :href => '#'}= sn.name
-            .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
-              = link_to edit_scientific_name_path(sn), class: 'dropdown-item' do
-                = edit_icon
-                = t('.edit')
-              .dropdown-divider
-              = link_to sn, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item text-danger' do
-                = delete_icon
-                = t('.delete')
+      - if can? :edit, sn
+        .dropdown.planting-actions
+          %a#planting-actions-scinames.dropdown-toggle.card-link{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button", :href => '#'}= sn.name
+          .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
+            = link_to edit_scientific_name_path(sn), class: 'dropdown-item' do
+              = edit_icon
+              = t('.edit')
+            .dropdown-divider
+            = link_to sn, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item text-danger' do
+              = delete_icon
+              = t('.delete')
+      - else
+        - if sn.gbif_key
+          = link_to sn.name, "https://www.gbif.org/species/#{sn.gbif_key}",
+                  class: 'card-link',
+                  target: "_blank",
+                  rel: "noopener noreferrer"
        - else
-          - if sn.gbif_key
-            = link_to sn.name, "https://www.gbif.org/species/#{sn.gbif_key}",
-                    class: 'card-link',
-                    target: "_blank",
-                    rel: "noopener noreferrer"
-          - else
-            .badge= sn.name
-      - if sn.wikidata_id.present?
-        = link_to "WD", "https://www.wikidata.org/wiki/#{sn.wikidata_id}", class: 'badge badge-info ms-1', target: '_blank', rel: 'noopener noreferrer', title: 'Wikidata'
+          .badge= sn.name

  %p.text-right
    - if can? :edit, crop
--- a/app/views/crops/_wrangle.html.haml
+++ b/app/views/crops/_wrangle.html.haml
@@ -14,10 +14,6 @@
          = icon 'far', 'update'
          Fetch data from GBIF

-        = link_to admin_crop_crop_companions_path(crop), class: 'dropdown-item' do
-          = icon 'fas', 'leaf'
-          Manage Companions
-
        - if can? :destroy, crop
          .dropdown-divider
          = delete_button(crop, classes: 'dropdown-item text-danger')
--- a/app/views/crops/data_improvement.html.haml
+++ b/app/views/crops/data_improvement.html.haml
@@ -1,13 +0,0 @@
-%h1 Data Improvement
-
- tabs = { photos: "Photos", descriptions: "Descriptions", youtube: "YouTube videos", alternate_names: "Alternate names", wikidata: "Wikidata ID", public_food_key: "Public Food Key", row_spacing: "Row spacing", sun_requirements: "Sun requirements", height: "Height" }
-
-%ul.nav.nav-tabs
-  - tabs.each do |key, value|
-    %li{class: "nav-item #{('active' if @active_tab == key.to_s)}"}
-      = link_to value, data_improvement_crops_path(tab: key)
-
-.tab-content
-  .tab-pane.active
-    %h2= "Crops without #{tabs[@active_tab.to_sym]}"
-    = render 'crop_list', crops: @crops
--- a/app/views/crops/index.html.haml
+++ b/app/views/crops/index.html.haml
@@ -1,10 +1,8 @@
 - content_for :title, t('.title')
- content_for :meta_description, "Browse and search for crops."

 - content_for :buttonbar do
  - if can? :wrangle, Crop
    = link_to 'Wrangle Crops', wrangle_crops_path, class: 'btn btn-secondary'
-  = link_to 'Data Improvement', data_improvement_crops_path, class: 'btn btn-info'
  - if can? :create, Crop
    = link_to 'Add New Crop', new_crop_path, class: 'btn btn-primary'

--- a/app/views/crops/show.html.haml
+++ b/app/views/crops/show.html.haml
@@ -1,13 +1,4 @@
-= render 'schema_org', crop: @crop
- content_for :title do
-  = @crop.name.titleize
-  - if @crop.default_scientific_name.present?
-    = " (#{@crop.default_scientific_name})"
- content_for :meta_description do
-  - if @crop.description.present?
-    = @crop.description
-  - else
-    = "Learn how to grow #{@crop.name}."
+- content_for :title, @crop.name
 - content_for :opengraph do
  = tag("meta", property: "og:image", content: crop_image_path(@crop))
  = tag("meta", property: "og:title", content: @crop.name)
@@ -20,8 +11,6 @@

 - content_for :breadcrumbs do
  %li.breadcrumb-item= link_to 'Crops', crops_path
-  - if @crop.parent
-    %li.breadcrumb-item.active= link_to @crop.parent.name.capitalize, @crop.parent
  %li.breadcrumb-item.active= link_to @crop.name.capitalize, @crop

 = render 'approval_status_message', crop: @crop
@@ -35,23 +24,12 @@
    %section.prediction
      = cute_icon
      = render 'predictions', crop: @crop
-    - if @crop.all_companions.any?
+    - if @crop.companions.any?
      %section.companions
        %h2 Companions
-        - @crop.all_companions.each do |companion|
+        - @crop.companions.each do |companion|
          = render 'crops/tiny', crop: companion

-    - if crop_or_parent(@crop, :en_youtube_url).present?
-      %section.youtube
-        %h2 Video
-        .embed-responsive.embed-responsive-16by9
-          %iframe.embed-responsive-item{ src: "https://www.youtube.com/embed/#{youtube_video_id(crop_or_parent(@crop, :en_youtube_url))}", allowfullscreen: true }
-    - else
-      - if member_signed_in?
-        %section.youtube
-          %h2 Video
-          %p= link_to "Submit a video.", edit_crop_path(@crop, anchor: ":~:text=Youtube")
-
    %section.photos
      = cute_icon
      = render 'crops/photos', crop: @crop
@@ -90,7 +68,6 @@

    %section.posts= render 'crops/posts', crop: @crop

-    = render 'history', crop: @crop
  .col-md-3
    = cute_icon
    .card
@@ -134,10 +111,6 @@
    = render 'harvests', crop: @crop
    = render 'find_seeds', crop: @crop

-    = render 'openfarm_data', crop: @crop
-
-    = render 'nutritional_data', crop: @crop
-
    = cute_icon
    .card
      .card-body
@@ -150,12 +123,6 @@
            = icon 'fas', 'external-link-alt'
            Wikipedia (English)

-        - if @crop.public_food_key.present?
-          %li.list-group-item
-            = link_to "https://afcd.foodstandards.gov.au/fooddetails.aspx?PFKID=#{@crop.public_food_key}", target: "_blank", rel: "noopener noreferrer" do
-              = icon 'fas', 'external-link-alt'
-              Australian Food Composition Database
-
        %li.list-group-item
          = link_to "https://www.gardenate.com/plant/#{CGI.escape @crop.name}",
                    target: "_blank",
@@ -188,10 +155,3 @@
            = icon 'fas', 'external-link-alt'
            Wikihow instructions

-        %li.list-group-item
-          = link_to "https://www.youtube.com/results?search_query=#{CGI.escape "growing #{@crop.name}"}",
-                    target: "_blank",
-                    class: 'card-link',
-                    rel: "noopener noreferrer" do
-            = icon 'fab', 'youtube'
-            YouTube
--- a/app/views/crops/wrangle.html.haml
+++ b/app/views/crops/wrangle.html.haml
@@ -17,9 +17,6 @@
  %h2 Crops

  %ul#myTab.nav.nav-tabs{role: "tablist"}
-    %li.nav-item
-      %a#home-tab.nav-link{ href: admin_crops_path, role: "tab", class: ''}
-        Recently edited
    %li.nav-item
      %a#home-tab.nav-link{ href: wrangle_crops_path, role: "tab", class: @approval_status.blank? ? 'active' : ''}
        Recently added
--- a/app/views/devise/registrations/_edit_apps.html.haml
+++ b/app/views/devise/registrations/_edit_apps.html.haml
@@ -15,16 +15,3 @@
                    method: :delete, class: "remove btn btn-danger"
        - else
          = link_to 'Connect to Flickr', '/members/auth/flickr', class: 'btn'
-  %hr
-  .row
-    .col-md-12
-      %p
-        = image_tag "icons/post.svg", size: "32x32", alt: 'API logo'
-        - if current_member.api_token?
-          Your API token is
-          %code= current_member.api_token.token
-          = link_to "Regenerate", regenerate_api_token_path,
-                    data: { confirm: "Are you sure? Your old token will stop working immediately." },
-                    method: :post, class: "remove btn btn-danger"
-        - else
-          = link_to 'Generate API Token', regenerate_api_token_path, method: :post, class: 'btn btn-primary'
--- a/app/views/gardens/_previously.haml
+++ b/app/views/gardens/_previously.haml
@@ -16,8 +16,3 @@
  .col-md-12
    %p Nothing has been planted here.

- if @finished_activities&.size&.positive?
-  %h2 Finished activities in garden
-  .index-cards
-    - @finished_activities.each do |activity|
-      = render "activities/card", activity: activity
--- a/app/views/gardens/index.html.haml
+++ b/app/views/gardens/index.html.haml
@@ -11,9 +11,6 @@

 .row
  .col-md-2
-    %small
-      %a{href: "#content"}
-        Skip to main content
    = render 'layouts/nav', model: Garden
    %label
      = link_to show_inactive_tickbox_path('gardens', owner: @owner, show_all: @show_all) do
@@ -23,7 +20,7 @@
      %hr/
      = render @owner

-  .col-md-10#content
+  .col-md-10
    - if @gardens.empty?
      %p There are no gardens to display.
      - if can?(:create, Garden) && @owner == current_member
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel O'Connor	1511de8a81	Merge branch 'dev' into fix-naming	2025-09-02 08:41:12 +09:30
Daniel O'Connor	df15383dd0	Merge branch 'dev' into fix-naming	2025-03-29 14:24:31 +10:30
Daniel O'Connor	bcaeaf3688	Merge branch 'dev' into fix-naming	2024-07-13 13:29:09 +09:30
Daniel O'Connor	2fc5b63c0e	Change naming to be aware of plant parts, even if it sounds oddly format	2024-03-23 06:57:11 +00:00
@@ -1 +1 @@
 .4.8
 .3.8