Merge pull request #4775 from Growstuff/dependabot/bundler/scout_apm-6.3.0

Bump scout_apm from 6.2.1 to 6.3.0
2026-09-08 12:06:59 -04:00 · 2026-09-08 12:48:35 +09:30 · 2026-09-07 15:35:15 +00:00 · 2026-09-08 01:03:06 +09:30 · 2026-09-07 07:04:02 +00:00 · 2026-09-03 19:33:57 +09:30
63 changed files with 1563 additions and 895 deletions
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:3.4-trixie
+FROM mcr.microsoft.com/devcontainers/ruby:4-trixie

 # Install Rails
 RUN gem install rails:8.0.5
@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v6
        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,7 +89,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -20,7 +20,7 @@ jobs:
        uses: docker/setup-buildx-action@v4

      - name: Log in to the Container registry
-        uses: docker/login-action@v4
+        uses: docker/login-action@v4.6.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -1 +1 @@
-3.4.9
+4.0.6
@@ -1,4 +1,4 @@
-FROM ruby:3.4.9-trixie
+FROM 4.0.6-trixie

 # Install system dependencies
 RUN apt-get update -qq && \
@@ -5,7 +5,9 @@ source 'https://rubygems.org'
 # Match ruby version in .ruby-version
 ruby File.read('.ruby-version')

-gem 'rails', '~> 8.0.0'
+gem 'rails', '~> 8.1.0'
+
+gem 'csv'

 # Keeping old sprockets
 # https://github.com/rails/sprockets-rails/issues/444#issuecomment-637817050
@@ -16,6 +18,7 @@ gem 'bundler', '>= 2.4.22'
 gem 'coffee-rails'
 gem 'haml'
 gem 'sassc-rails'
+gem 'oauth', '1.1.6' # Explicitly pinned, as the maintainer does huge (400 files, 45k lines) changes in point releases - required manual plus agentic security review.

 # API data
 gem 'jsonapi-resources'
@@ -33,29 +33,31 @@ GEM
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (8.0.5)
-      actionpack (= 8.0.5)
-      activesupport (= 8.0.5)
+    action_text-trix (2.1.19)
+      railties
+    actioncable (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    actionmailbox (8.0.5)
-      actionpack (= 8.0.5)
-      activejob (= 8.0.5)
-      activerecord (= 8.0.5)
-      activestorage (= 8.0.5)
-      activesupport (= 8.0.5)
+    actionmailbox (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
      mail (>= 2.8.0)
-    actionmailer (8.0.5)
-      actionpack (= 8.0.5)
-      actionview (= 8.0.5)
-      activejob (= 8.0.5)
-      activesupport (= 8.0.5)
+    actionmailer (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      actionview (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
      mail (>= 2.8.0)
      rails-dom-testing (~> 2.2)
-    actionpack (8.0.5)
-      actionview (= 8.0.5)
-      activesupport (= 8.0.5)
+    actionpack (8.1.3.1)
+      actionview (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
      nokogiri (>= 1.8.5)
      rack (>= 2.2.4)
      rack-session (>= 1.0.1)
@@ -63,15 +65,16 @@ GEM
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
      useragent (~> 0.16)
-    actiontext (8.0.5)
-      actionpack (= 8.0.5)
-      activerecord (= 8.0.5)
-      activestorage (= 8.0.5)
-      activesupport (= 8.0.5)
+    actiontext (8.1.3.1)
+      action_text-trix (~> 2.1.15)
+      actionpack (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (8.0.5)
-      activesupport (= 8.0.5)
+    actionview (8.1.3.1)
+      activesupport (= 8.1.3.1)
      builder (~> 3.1)
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
@@ -86,29 +89,29 @@ GEM
    active_utils (3.6.0)
      activesupport (>= 4.2)
      i18n
-    activejob (8.0.5)
-      activesupport (= 8.0.5)
+    activejob (8.1.3.1)
+      activesupport (= 8.1.3.1)
      globalid (>= 0.3.6)
-    activemodel (8.0.5)
-      activesupport (= 8.0.5)
-    activerecord (8.0.5)
-      activemodel (= 8.0.5)
-      activesupport (= 8.0.5)
+    activemodel (8.1.3.1)
+      activesupport (= 8.1.3.1)
+    activerecord (8.1.3.1)
+      activemodel (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
      timeout (>= 0.4.0)
-    activestorage (8.0.5)
-      actionpack (= 8.0.5)
-      activejob (= 8.0.5)
-      activerecord (= 8.0.5)
-      activesupport (= 8.0.5)
+    activestorage (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
      marcel (~> 1.0)
-    activesupport (8.0.5)
+    activesupport (8.1.3.1)
      base64
-      benchmark (>= 0.3)
      bigdecimal
      concurrent-ruby (~> 1.0, >= 1.3.1)
      connection_pool (>= 2.2.5)
      drb
      i18n (>= 1.6, < 2)
+      json
      logger (>= 1.4.2)
      minitest (>= 5.1)
      securerandom (>= 0.3)
@@ -116,12 +119,16 @@ GEM
      uri (>= 0.13.1)
    addressable (2.9.0)
      public_suffix (>= 2.0.2, < 8.0)
+    anonymous_loader (0.1.3)
+      version_gem (~> 1.1, >= 1.1.14)
    ast (2.4.3)
+    auth-sanitizer (0.2.3)
+      version_gem (~> 1.1, >= 1.1.14)
    autoprefixer-rails (10.4.16.0)
      execjs (~> 2)
    aws-eventstream (1.4.0)
-    aws-partitions (1.1261.0)
-    aws-sdk-core (3.252.0)
+    aws-partitions (1.1279.0)
+    aws-sdk-core (3.254.1)
      aws-eventstream (~> 1, >= 1.3.0)
      aws-partitions (~> 1, >= 1.992.0)
      aws-sigv4 (~> 1.9)
@@ -129,34 +136,23 @@ GEM
      bigdecimal
      jmespath (~> 1, >= 1.6.1)
      logger
-    aws-sdk-kms (1.129.0)
-      aws-sdk-core (~> 3, >= 3.248.0)
+    aws-sdk-kms (1.130.0)
+      aws-sdk-core (~> 3, >= 3.254.0)
      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.226.0)
-      aws-sdk-core (~> 3, >= 3.248.0)
+    aws-sdk-s3 (1.229.0)
+      aws-sdk-core (~> 3, >= 3.254.1)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.5)
    aws-sigv4 (1.12.1)
      aws-eventstream (~> 1, >= 1.0.2)
-    axe-core-api (4.11.3)
+    axe-core-api (4.13.0)
      dumb_delegator
-      ostruct
-      virtus
-    axe-core-capybara (4.11.3)
-      axe-core-api (= 4.11.3)
-      dumb_delegator
-    axe-core-rspec (4.11.3)
-      axe-core-api (= 4.11.3)
-      dumb_delegator
-      ostruct
-      virtus
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
+    axe-core-capybara (4.13.0)
+      axe-core-api (= 4.13.0)
+    axe-core-rspec (4.13.0)
+      axe-core-api (= 4.13.0)
    base64 (0.3.0)
    bcrypt (3.1.22)
-    benchmark (0.5.0)
    better_errors (2.10.1)
      erubi (>= 1.0.0)
      rack (>= 0.9.0)
@@ -175,7 +171,7 @@ GEM
      actionpack (>= 6.1)
      activemodel (>= 6.1)
    builder (3.3.0)
-    bullet (8.1.3)
+    bullet (8.2.0)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
    byebug (13.0.0)
@@ -196,19 +192,18 @@ GEM
    capybara-screenshot (1.0.27)
      capybara (>= 1.0, < 4)
      launchy
-    carrierwave (3.0.7)
+    carrierwave (3.1.3)
      activemodel (>= 6.0.0)
      activesupport (>= 6.0.0)
      addressable (~> 2.6)
      image_processing (~> 1.1)
      marcel (~> 1.0.0)
      ssrf_filter (~> 1.0)
+    cgi (0.5.2)
    chartkick (5.2.1)
    childprocess (5.1.0)
      logger (~> 1.5)
    coderay (1.1.3)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
    coffee-rails (5.0.0)
      coffee-script (>= 2.2.0)
      railties (>= 5.2.0)
@@ -218,9 +213,9 @@ GEM
    coffee-script-source (1.12.2)
    comfy_bootstrap_form (4.0.9)
      rails (>= 5.0.0)
-    concurrent-ruby (1.3.7)
+    concurrent-ruby (1.3.8)
    connection_pool (2.5.5)
-    crass (1.0.6)
+    crass (1.0.7)
    crowdin-api (1.12.0)
      open-uri (>= 0.1.0, < 0.2.0)
      rest-client (>= 2.0.0, < 2.2.0)
@@ -229,11 +224,11 @@ GEM
      gli (>= 2.7.0)
      i18n (>= 0.6.4)
      rubyzip (>= 1.0.0)
-    csv (3.3.5)
+    csv (3.3.6)
    csv_shaper (1.4.0)
      activesupport (>= 3.0.0)
      csv
-    dalli (5.0.5)
+    dalli (5.1.0)
      logger
    database_cleaner (2.1.0)
      database_cleaner-active_record (>= 2, < 3)
@@ -242,8 +237,6 @@ GEM
      database_cleaner-core (~> 2.0.0)
    database_cleaner-core (2.0.1)
    date (3.5.1)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
    devise (5.0.4)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
@@ -273,9 +266,9 @@ GEM
    elasticsearch-transport (7.0.0)
      faraday
      multi_json
-    erb (6.0.4)
+    erb (6.0.7)
    erubi (1.13.1)
-    execjs (2.10.0)
+    execjs (2.10.1)
    factory_bot (6.5.5)
      activesupport (>= 6.1.0)
    factory_bot_rails (6.5.1)
@@ -289,8 +282,8 @@ GEM
      logger
    faraday-net_http (3.4.4)
      net-http (~> 0.5)
-    ffi (1.17.3)
-    ffi (1.17.3-x86_64-linux-gnu)
+    ffi (1.17.4)
+    ffi (1.17.4-x86_64-linux-gnu)
    flickraw (0.9.10)
    font-awesome-sass (5.15.1)
      sassc (>= 1.11)
@@ -305,21 +298,22 @@ GEM
      multi_json (>= 1.9.0)
    gli (2.22.2)
      ostruct
-    globalid (1.3.0)
+    globalid (1.4.0)
      activesupport (>= 6.1)
    gravatar-ultimate (2.0.0)
      activesupport (>= 2.3.14)
      rack
-    haml (7.2.0)
+    haml (7.5.1)
+      prism (>= 1.1.0)
      temple (>= 0.8.2)
      thor
      tilt
-    haml-rails (3.0.0)
+    haml-rails (3.1.0)
      actionpack (>= 5.1)
      activesupport (>= 5.1)
      haml (>= 4.0.6)
      railties (>= 5.1)
-    haml_lint (0.74.0)
+    haml_lint (0.78.0)
      haml (>= 5.0)
      parallel (>= 1.10)
      rainbow
@@ -352,17 +346,16 @@ GEM
      terminal-table (>= 1.5.1)
    i18n_data (1.1.0)
      simple_po_parser (~> 1.1)
-    icalendar (2.12.3)
+    icalendar (2.12.4)
      base64
      ice_cube (~> 0.16)
      logger
      ostruct
    ice_cube (0.17.0)
-    ice_nine (0.11.2)
-    image_processing (1.12.2)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
      ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.2)
+    io-console (0.9.2)
    irb (1.18.0)
      pp (>= 0.6.0)
      prism (>= 1.3.0)
@@ -373,7 +366,7 @@ GEM
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
-    json (2.19.9)
+    json (2.21.2)
    json-schema (6.2.0)
      addressable (~> 2.8)
      bigdecimal (>= 3.1, < 5)
@@ -385,7 +378,7 @@ GEM
    kgio (2.11.4)
    kramdown (2.4.0)
      rexml
-    language_server-protocol (3.17.0.5)
+    language_server-protocol (3.17.0.6)
    launchy (3.1.1)
      addressable (~> 2.8)
      childprocess (~> 5.0)
@@ -401,10 +394,10 @@ GEM
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
    logger (1.7.0)
-    loofah (2.25.1)
+    loofah (2.25.2)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
-    mail (2.9.0)
+    mail (2.9.1)
      logger
      mini_mime (>= 0.1.1)
      net-imap
@@ -429,19 +422,20 @@ GEM
    mimemagic (0.4.3)
      nokogiri (~> 1)
      rake
-    mini_magick (4.12.0)
+    mini_magick (5.3.1)
+      logger
    mini_mime (1.1.5)
    mini_portile2 (2.8.9)
    minitest (6.0.6)
      drb (~> 2.0)
      prism (~> 1.5)
-    msgpack (1.8.3)
+    msgpack (1.8.4)
    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.6.4.1)
+    net-imap (0.6.6)
      date
      net-protocol
    net-pop (0.1.2)
@@ -457,8 +451,18 @@ GEM
      racc (~> 1.4)
    nokogiri (1.19.4-x86_64-linux-gnu)
      racc (~> 1.4)
-    oauth (0.5.6)
-    oj (3.17.3)
+    oauth (1.1.6)
+      auth-sanitizer (~> 0.2, >= 0.2.1)
+      base64 (~> 0.1)
+      cgi
+      oauth-tty (~> 1.0, >= 1.0.8)
+      snaky_hash (~> 2.0, >= 2.0.5)
+      version_gem (~> 1.1, >= 1.1.11)
+    oauth-tty (1.0.13)
+      anonymous_loader (~> 0.1, >= 0.1.3)
+      auth-sanitizer (~> 0.2, >= 0.2.3)
+      version_gem (~> 1.1, >= 1.1.14)
+    oj (3.17.6)
      bigdecimal (>= 3.0)
      ostruct (>= 0.2)
    omniauth (1.9.2)
@@ -477,15 +481,15 @@ GEM
      activerecord (>= 7.1)
      request_store (~> 1.4)
    parallel (2.1.0)
-    parser (3.3.11.1)
+    parser (3.3.12.0)
      ast (~> 2.4.1)
      racc
-    percy-capybara (5.0.0)
+    percy-capybara (5.0.1)
      capybara (>= 3)
    pg (1.6.3)
    pg (1.6.3-x86_64-linux)
    popper_js (2.11.8)
-    pp (0.6.3)
+    pp (0.6.4)
      prettyprint
    prettyprint (0.2.0)
    prism (1.9.0)
@@ -493,15 +497,12 @@ GEM
      coderay (~> 1.1)
      method_source (~> 1.0)
      reline (>= 0.6.0)
-    psych (5.3.1)
-      date
-      stringio
    public_suffix (7.0.5)
    puma (8.0.2)
      nio4r (~> 2.0)
    query_diet (0.7.3)
    racc (1.8.1)
-    rack (2.2.23)
+    rack (2.2.24)
    rack-attack (6.8.0)
      rack (>= 1.0, < 4)
    rack-cors (2.0.2)
@@ -516,20 +517,20 @@ GEM
    rackup (1.0.1)
      rack (< 3)
      webrick
-    rails (8.0.5)
-      actioncable (= 8.0.5)
-      actionmailbox (= 8.0.5)
-      actionmailer (= 8.0.5)
-      actionpack (= 8.0.5)
-      actiontext (= 8.0.5)
-      actionview (= 8.0.5)
-      activejob (= 8.0.5)
-      activemodel (= 8.0.5)
-      activerecord (= 8.0.5)
-      activestorage (= 8.0.5)
-      activesupport (= 8.0.5)
+    rails (8.1.3.1)
+      actioncable (= 8.1.3.1)
+      actionmailbox (= 8.1.3.1)
+      actionmailer (= 8.1.3.1)
+      actionpack (= 8.1.3.1)
+      actiontext (= 8.1.3.1)
+      actionview (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activemodel (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
      bundler (>= 1.15.0)
-      railties (= 8.0.5)
+      railties (= 8.1.3.1)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
      actionview (>= 5.0.1.rc1)
@@ -538,8 +539,8 @@ GEM
      activesupport (>= 5.0.0)
      minitest
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.7.0)
-      loofah (~> 2.25)
+    rails-html-sanitizer (1.7.1)
+      loofah (~> 2.25, >= 2.25.2)
      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 (8.1.0)
      i18n (>= 0.7, < 2)
@@ -549,9 +550,9 @@ GEM
      rails_stdout_logging
    rails_serve_static_assets (0.0.5)
    rails_stdout_logging (0.0.5)
-    railties (8.0.5)
-      actionpack (= 8.0.5)
-      activesupport (= 8.0.5)
+    railties (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
      irb (~> 1.13)
      rackup (>= 1.0.0)
      rake (>= 12.2)
@@ -564,19 +565,24 @@ GEM
    rb-fsevent (0.11.2)
    rb-inotify (0.11.1)
      ffi (~> 1.0)
-    rdoc (7.2.0)
+    rbs (4.2.0)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.0.0)
      erb
-      psych (>= 4.0.0)
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
      tsort
    recaptcha (5.21.2)
    redis-client (0.26.2)
      connection_pool
    regexp_parser (2.12.0)
-    reline (0.6.3)
+    reline (0.7.0)
      io-console (~> 0.5)
    request_store (1.7.0)
      rack (>= 1.4)
-    responders (3.2.0)
+    responders (3.2.1)
      actionpack (>= 7.0)
      railties (>= 7.0)
    rest-client (2.1.0)
@@ -628,8 +634,8 @@ GEM
    rswag-ui (2.17.0)
      actionpack (>= 5.2, < 8.2)
      railties (>= 5.2, < 8.2)
-    rubocop (1.88.0)
-      json (~> 2.3)
+    rubocop (1.90.0)
+      json (>= 2.3)
      language_server-protocol (~> 3.17.0.2)
      lint_roller (~> 1.1.0)
      parallel (>= 1.10)
@@ -639,7 +645,7 @@ GEM
      rubocop-ast (>= 1.49.0, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.1)
+    rubocop-ast (1.50.0)
      parser (>= 3.3.7.2)
      prism (~> 1.7)
    rubocop-capybara (3.0.0)
@@ -648,11 +654,11 @@ GEM
    rubocop-factory_bot (2.28.0)
      lint_roller (~> 1.1)
      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.35.5)
+    rubocop-rails (2.37.0)
      activesupport (>= 4.2.0)
      lint_roller (~> 1.1)
      rack (>= 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.89.0, < 2.0)
      rubocop-ast (>= 1.44.0, < 2.0)
    rubocop-rake (0.7.1)
      lint_roller (~> 1.1)
@@ -667,9 +673,10 @@ GEM
      rubocop-rspec (~> 3.5)
    ruby-progressbar (1.13.0)
    ruby-units (4.1.0)
-    ruby-vips (2.2.1)
+    ruby-vips (2.3.0)
      ffi (~> 1.12)
-    rubyzip (3.4.0)
+      logger
+    rubyzip (3.6.0)
    sass (3.7.4)
      sass-listen (~> 4.0.0)
    sass-listen (4.0.0)
@@ -683,13 +690,13 @@ GEM
      sprockets (> 3.0)
      sprockets-rails
      tilt
-    scout_apm (6.2.0)
+    scout_apm (6.3.0)
      parser
    searchkick (5.3.1)
      activemodel (>= 6.1)
      hashie
    securerandom (0.4.1)
-    selenium-webdriver (4.45.0)
+    selenium-webdriver (4.48.0)
      base64 (~> 0.2)
      logger (~> 1.4)
      rexml (~> 3.2, >= 3.2.5)
@@ -702,8 +709,11 @@ GEM
      rack (>= 2.2.4, < 3.3)
      redis-client (>= 0.23.0, < 1)
    simple_po_parser (1.1.6)
-    sitemap_generator (6.3.0)
+    sitemap_generator (7.1.1)
      builder (~> 3.0)
+    snaky_hash (2.0.7)
+      hashie (>= 0.1.0, < 6)
+      version_gem (~> 1.1, >= 1.1.14)
    sprockets (3.7.5)
      base64
      concurrent-ruby (~> 1.0)
@@ -712,17 +722,15 @@ GEM
      actionpack (>= 5.2)
      activesupport (>= 5.2)
      sprockets (>= 3.0.0)
-    ssrf_filter (1.1.2)
-    stringio (3.2.0)
+    ssrf_filter (1.5.0)
    sysexits (1.2.0)
-    temple (0.10.4)
+    temple (0.10.7)
    terminal-table (4.0.0)
      unicode-display_width (>= 1.1.1, < 4)
-    terser (1.2.7)
+    terser (1.2.8)
      execjs (>= 0.3.0, < 3)
    thor (1.5.0)
-    thread_safe (0.3.6)
-    tilt (2.7.0)
+    tilt (2.9.0)
    timecop (0.9.11)
    timeout (0.6.1)
    tsort (0.2.0)
@@ -741,10 +749,7 @@ GEM
      activemodel (>= 3.0.0)
      public_suffix
    vcr (6.4.0)
-    virtus (2.0.0)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
+    version_gem (1.1.15)
    warden (1.2.9)
      rack (>= 2.0.9)
    webrat (0.7.3)
@@ -753,7 +758,7 @@ GEM
      rack-test (>= 0.5.3)
    webrick (1.9.2)
    websocket (1.2.11)
-    websocket-driver (0.8.0)
+    websocket-driver (0.8.2)
      base64
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
@@ -765,7 +770,7 @@ GEM
      webrick
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.7.5)
+    zeitwerk (2.8.3)

 PLATFORMS
  ruby
@@ -796,6 +801,7 @@ DEPENDENCIES
  comfortable_mexican_sofa!
  connection_pool (< 3)
  crowdin-cli
+  csv
  csv_shaper
  dalli
  database_cleaner
@@ -833,6 +839,7 @@ DEPENDENCIES
  material_icons
  memcachier
  msgpack
+  oauth (= 1.1.6)
  oj
  omniauth (~> 1.3)
  omniauth-flickr (>= 0.0.15)
@@ -845,7 +852,7 @@ DEPENDENCIES
  rack-attack
  rack-cors
  rack-protection (>= 2.0.1)
-  rails (~> 8.0.0)
+  rails (~> 8.1.0)
  rails-assets-leaflet.markercluster!
  rails-controller-testing
  rails_12factor
@@ -885,7 +892,7 @@ DEPENDENCIES
  xmlrpc

 RUBY VERSION
-   ruby 3.4.9
+   ruby 4.0.6

 BUNDLED WITH
   2.4.22
@@ -4,27 +4,26 @@ class HarvestsController < DataController
  after_action :update_crop_medians, only: %i(create update destroy)

  def index
-    where = {}
+    @harvests = Harvest.all
+
    if params[:member_slug].present?
      @owner = Member.find_by!(slug: params[:member_slug])
-      where['owner_id'] = @owner.id
+      @harvests = @harvests.where(owner_id: @owner.id)
    end

    if params[:crop_slug]
      @crop = Crop.find_by(slug: params[:crop_slug])
-      where['crop_id'] = @crop.id
+      @harvests = @harvests.where(crop_id: @crop.id) if @crop
    end

    if params[:planting_slug]
      @planting = Planting.find_by(slug: params[:planting_slug])
-      where['planting_id'] = @planting.id
+      @harvests = @harvests.where(planting_id: @planting.id) if @planting
    end

-    @harvests = Harvest.search('*', where:,
-                                    limit:    100,
-                                    page:     params[:page],
-                                    load:     (request.format.csv? ? { include: %i(crop owner plant_part) } : false),
-                                    boost_by: [:created_at])
+    @harvests = @harvests.includes(:crop, :owner, :plant_part)
+
+    @harvests = @harvests.recent.paginate(page: params[:page], per_page: 100)

    @filename = csv_filename

@@ -40,12 +40,9 @@ class MembersController < ApplicationController
      end
    end

-    @harvests = Harvest.search(
-      where:    { owner_id: @member.id },
-      boost_by: [:created_at],
-      limit:    16,
-      load:     false
-    )
+    @harvests = Harvest.where(owner_id: @member.id)
+                       .recent
+                       .limit(16)

    respond_to do |format|
      format.html # show.html.haml
@@ -8,26 +8,10 @@ class PlantingsController < DataController
  def index
    @show_all = params[:all] == '1'

-    where = {}
-    where['active'] = true unless @show_all
+    @owner = Member.find_by!(slug: params[:member_slug]) if params[:member_slug].present?
+    @crop = Crop.find_by(slug: params[:crop_slug]) if params[:crop_slug]

-    if params[:member_slug].present?
-      @owner = Member.find_by!(slug: params[:member_slug])
-      where['owner_id'] = @owner.id
-    end
-
-    if params[:crop_slug]
-      @crop = Crop.find_by(slug: params[:crop_slug])
-      where['crop_id'] = @crop.id unless @crop.nil?
-    end
-
-    @plantings = Planting.search(
-      where:,
-      page:     params[:page],
-      limit:    30,
-      boost_by: [:created_at],
-      load:     false
-    )
+    @plantings = plantings

    @filename = "Growstuff-#{specifics}Plantings-#{Time.zone.now.to_fs(:number)}.csv"
    respond_with(@plantings)
@@ -35,7 +19,7 @@ class PlantingsController < DataController

  def show
    @photos = @planting.photos.includes(:owner).order(date_taken: :desc)
-    @harvests = Harvest.search(where: { planting_id: @planting.id })
+    @harvests = Harvest.where(planting_id: @planting.id).recent
    @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
@@ -2,36 +2,32 @@

 class SeedsController < DataController
  def index
-    where = {}
+    @seeds = Seed.all

    if params[:member_slug].present?
      @owner = Member.find_by!(slug: params[:member_slug])
-      where['owner_id'] = @owner.id
+      @seeds = @seeds.where(owner_id: @owner.id)
    end

    if params[:crop_slug].present?
      @crop = Crop.find_by(slug: params[:crop_slug])
-      where['crop_id'] = @crop.id
+      @seeds = @seeds.where(crop_id: @crop.id) if @crop
    end

    if params[:planting_id].present?
      @planting = Planting.find_by(slug: params[:planting_id])
-      where['parent_planting'] = @planting.id
+      @seeds = @seeds.where(parent_planting_id: @planting.id) if @planting
    end

-    where['tradeable_to'] = params[:tradeable_to] if params[:tradeable_to].present?
+    @seeds = @seeds.where(tradable_to: params[:tradeable_to]) if params[:tradeable_to].present?

    @show_all = (params[:all] == '1')
-    where['finished'] = false unless @show_all
+    @seeds = @seeds.current unless @show_all

    @filename = csv_filename
-    @seeds = Seed.search(
-      where:,
-      page:     params[:page],
-      limit:    30,
-      boost_by: [:created_at],
-      load:     (request.format.csv? ? { include: %i(crop owner) } : false)
-    )
+    @seeds = @seeds.includes(:crop, :owner)
+                   .order(created_at: :desc)
+                   .paginate(page: params[:page], per_page: 30)

    respond_with(@seeds)
  end
@@ -18,9 +18,11 @@ module PhotoCapable
    def thumbnail_url
      df = default_photo

-      return unless df
-
-      df.source == 'flickr' ? df.fullsize_url : df.thumbnail_url
+      if df
+        df.source == 'flickr' ? df.fullsize_url : df.thumbnail_url
+      elsif respond_to?(:crop) && crop.present?
+        crop.thumbnail_url
+      end
    end

    def most_liked_photo
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-module SearchHarvests
-  extend ActiveSupport::Concern
-
-  included do
-    searchkick merge_mappings: true,
-               settings:       { number_of_shards: 1, number_of_replicas: 0 },
-               mappings:       {
-                 properties: {
-                   harvests_count: { type: :integer },
-                   photos_count:   { type: :integer },
-                   created_at:     { type: :integer },
-                   harvested_at:   { type: :date }
-                 }
-               }
-
-    def search_data
-      {
-        slug:,
-        quantity:,
-
-        # crop
-        crop_id:,
-        crop_name:,
-        crop_slug:        crop.slug,
-
-        # owner
-        owner_id:,
-        owner_login_name:,
-        owner_slug:,
-        plant_part_name:  plant_part&.name,
-
-        # planting
-        planting_id:,
-        planting_slug:    planting&.slug,
-
-        # photo
-        has_photos:       photos.size.positive?,
-        thumbnail_url:    default_photo&.thumbnail_url || crop.default_photo&.thumbnail_url,
-
-        # counts
-        photos_count:     photos.count,
-
-        # timestamps
-        harvested_at:,
-        created_at:       created_at.to_i
-      }
-    end
-
-    def self.homepage_records(limit)
-      records = []
-      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 },
-          owner_id:     { not: owners }
-        }
-        one_record = search('*',
-                            limit:    1,
-                            where:,
-                            boost_by: [:created_at],
-                            load:     false).first
-        return records if one_record.nil?
-
-        owners << one_record.owner_id
-        records << one_record
-      end
-      records
-    end
-  end
-end
@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-module SearchPlantings
-  extend ActiveSupport::Concern
-
-  included do
-    searchkick merge_mappings: true,
-               settings:       { number_of_shards: 1, number_of_replicas: 0 },
-               mappings:       {
-                 properties: {
-                   active:         { type: :boolean },
-                   created_at:     { type: :integer },
-                   harvests_count: { type: :integer },
-                   photos_count:   { type: :integer },
-                   owner_location: { type: :text }
-                 }
-               }
-
-    def search_data
-      {
-        slug:,
-        active:,
-        finished:                   finished?,
-        has_photos:                 photos.size.positive?,
-        location:,
-        percentage_grown:           percentage_grown.to_i,
-        planted_at:,
-        planted_from:,
-        planted_year:               planted_at&.year,
-        quantity:,
-        sunniness:,
-        garden_id:,
-        garden_slug:                garden&.garden_slug,
-        garden_name:                garden&.name,
-        description:,
-
-        first_harvest_predicted_at:,
-        finish_predicted_at:,
-
-        # crops
-        crop_id:,
-        crop_name:,
-        crop_slug:,
-        crop_perennial:,
-
-        # owner
-        owner_id:,
-        owner_location:,
-        owner_login_name:,
-        owner_slug:,
-
-        # photos
-        thumbnail_url:              default_photo&.thumbnail_url || crop.default_photo&.thumbnail_url,
-        # counts
-        photos_count:               photos.size,
-        harvests_count:,
-
-        # timestamps
-        created_at:                 created_at.to_i,
-        updated_at:                 updated_at.to_i
-      }
-    end
-
-    def self.homepage_records(limit)
-      records = []
-      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 },
-          owner_id:     { not: owners }
-        }
-        one_record = search('*',
-                            limit:    1,
-                            where:,
-                            boost_by: [:created_at],
-                            load:     false).first
-        return records if one_record.nil?
-
-        owners << one_record.owner_id
-        records << one_record
-      end
-      records
-    end
-  end
-end
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-module SearchSeeds
-  extend ActiveSupport::Concern
-
-  included do
-    searchkick merge_mappings: true,
-               settings:       { number_of_shards: 1, number_of_replicas: 0 },
-               mappings:       {
-                 properties: {
-                   id:           { type: :integer },
-                   created_at:   { type: :integer },
-                   plant_before: { type: :text },
-                   photos_count: { type: :integer },
-                   tradable_to:  { type: :text }
-                 }
-               }
-
-    def search_data
-      {
-        slug:,
-        finished:         finished?,
-        gmo:,
-        active:,
-        heirloom:,
-        location:         owner.location,
-        organic:,
-        quantity:,
-        plant_before:     plant_before&.to_fs(:ymd),
-        tradable_to:,
-        tradable:,
-
-        # crop
-        crop_id:,
-        crop_name:        crop.name,
-        crop_slug:        crop.slug,
-
-        # owner
-        owner_id:,
-        owner_location:,
-        owner_login_name:,
-        owner_slug:,
-
-        # planting
-        parent_planting:,
-
-        # counts
-        photos_count:     photos.size,
-
-        # photo
-        has_photos:       photos.size.positive?,
-        thumbnail_url:    default_photo&.thumbnail_url || crop.default_photo&.thumbnail_url,
-
-        created_at:       created_at.to_i
-      }
-    end
-
-    def self.homepage_records(limit)
-      search('*', limit:,
-                  where:    {
-                    finished: false,
-                    tradable: true,
-                    _or:      [{ plant_before: nil }, { plant_before: { lt: Date.today } }]
-                  },
-                  boost_by: [:created_at],
-                  load:     false)
-    end
-  end
-end
@@ -5,7 +5,6 @@ class Harvest < ApplicationRecord
  extend FriendlyId
  include PhotoCapable
  include Ownable
-  include SearchHarvests
  include Likeable

  attr_accessor :overall_rating
@@ -156,6 +155,10 @@ class Harvest < ApplicationRecord
    end
  end

+  def self.homepage_records(limit)
+    recent.one_per_owner.limit(limit)
+  end
+
  private

  def crop_must_match_planting
@@ -28,6 +28,7 @@ class PhotoAssociation < ApplicationRecord

  def photo_and_item_have_same_owner
    return if photographable_type == 'Crop'
+    return if photographable.blank?

    errors.add(:photo, :photo_owner_mismatch) unless photographable.owner_id == photo.owner_id
  end
@@ -7,7 +7,6 @@ class Planting < ApplicationRecord
  include Ownable
  include PredictPlanting
  include PredictHarvest
-  include SearchPlantings
  include Likeable

  friendly_id :planting_slug, use: %i(slugged finders)
@@ -133,6 +132,10 @@ class Planting < ApplicationRecord
                        end
  end

+  def self.homepage_records(limit)
+    recent.one_per_owner.limit(limit)
+  end
+
  private

  def cannot_be_finished_and_failed
@@ -5,7 +5,6 @@ class Seed < ApplicationRecord
  include PhotoCapable
  include Finishable
  include Ownable
-  include SearchSeeds

  friendly_id :seed_slug, use: %i(slugged finders)

@@ -73,4 +72,11 @@ class Seed < ApplicationRecord
  def to_s
    I18n.t('seeds.string', crop: crop.name, owner:)
  end
+
+  def self.homepage_records(limit)
+    current.tradable
+           .where("plant_before IS NULL OR plant_before < ?", Time.zone.today)
+           .order(created_at: :desc)
+           .limit(limit)
+  end
 end
@@ -1,12 +1,12 @@
 %h2= t('.recently_planted')
 - Planting.homepage_records(6).each do |planting|
-  - next unless planting['thumbnail_url'].present?
-  = link_to planting_path(slug: planting['slug']), class: 'list-group-item list-group-item-action flex-column align-items-start' do
+  - next unless planting.thumbnail_url.present?
+  = link_to planting_path(slug: planting.slug), class: 'list-group-item list-group-item-action flex-column align-items-start' do
    .d-flex.w-100.justify-content-between.homepage--list-item
      %p.mb-2
-        = image_tag planting['thumbnail_url'], width: 75, class: 'rounded shadow', alt: "Image of #{planting['crop_name']} by #{planting['owner_login_name']}"
+        = image_tag planting.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{planting.crop_name} by #{planting.owner_login_name}"
      .text-right
-        %h4= planting['crop_name']
-        - if planting['planted_from'].present?
-          %span.badge.badge-success= planting['planted_from'].pluralize
-        %small.text-muted planted by #{planting['owner_login_name']}
+        %h4= planting.crop_name
+        - if planting.planted_from.present?
+          %span.badge.badge-success= planting.planted_from.pluralize
+        %small.text-muted planted by #{planting.owner_login_name}
@@ -7,34 +7,34 @@ cal.description = "Plantings by #{@owner.login_name}"
  event = Icalendar::Event.new

  lines = []
-  lines << "Quantity: #{planting['quantity'] ? planting['quantity'] : 'unknown' }"
-  lines << "Planted on: #{planting['planted_at'] ? planting['planted_at'] : 'unknown' }"
-  lines << "Sunniness: #{planting['sunniness'] ? planting['sunniness'] : 'unknown' }"
-  lines << "Planted from: #{planting['planted_from'] ? planting['planted_from'] : 'unknown' }"
-  lines << "First harvest from: #{planting['first_harvest_predicted_at'] ? planting['first_harvest_predicted_at'] : 'unknown' }"
-  lines << "Last harvest from: #{planting['last_harvest_predicted_at'] ? planting['last_harvest_predicted_at'] : 'unknown' }"
-  lines << "Finish predicted at: #{planting['finish_predicted_at'] ? planting['finish_predicted_at'] : 'unknown'}"
-  lines << "Finished at: #{planting['finished_at'] ? planting['finished_at'] : 'unknown' }"
+  lines << "Quantity: #{planting.quantity || 'unknown' }"
+  lines << "Planted on: #{planting.planted_at || 'unknown' }"
+  lines << "Sunniness: #{planting.sunniness || 'unknown' }"
+  lines << "Planted from: #{planting.planted_from || 'unknown' }"
+  lines << "First harvest from: #{planting.first_harvest_predicted_at || 'unknown' }"
+  lines << "Last harvest from: #{planting.last_harvest_predicted_at || 'unknown' }"
+  lines << "Finish predicted at: #{planting.finish_predicted_at || 'unknown'}"
+  lines << "Finished at: #{planting.finished_at || 'unknown' }"

  lines << planting.description
-  finish_date = Date.parse(planting['finished_at'] || planting['finish_predicted_at'] || planting['last_harvest_predicted_at']) rescue nil
+  finish_date = (planting.finished_at || planting.finish_predicted_at || planting.last_harvest_predicted_at)&.to_date

-  event.dtstart     = Time.at(planting['created_at'])
-  event.dtend       = finish_date || 1.day.from_now
-  event.summary     = planting['crop_name']
+  event.dtstart     = planting.created_at
+  event.dtend       = finish_date || 1.day.from_now.to_date
+  event.summary     = planting.crop.name
  event.description = lines.join("\n")
  event.ip_class    = "PUBLIC"
-  event.url = planting_url(slug: planting['slug'])
+  event.url = planting_url(slug: planting.slug)

  cal.add_event(event)

  if finish_date && finish_date > Date.today
-    predicted_date = Date.parse(planting['first_harvest_predicted_at']) if planting['first_harvest_predicted_at']
+    predicted_date = planting.first_harvest_predicted_at&.to_date

    todo = Icalendar::Todo.new
    todo.dtstart = predicted_date || finish_date || Date.today
    todo.due = finish_date
-    todo.summary = "Harvest #{planting['crop_name']}"
+    todo.summary = "Harvest #{planting.crop.name}"

    cal.add_todo(todo)

@@ -42,9 +42,9 @@ cal.description = "Plantings by #{@owner.login_name}"
    event = Icalendar::Event.new
    event.dtstart = predicted_date || finish_date || Date.today
    event.dtend = finish_date
-    event.summary = "Harvest #{planting['crop_name']}"
+    event.summary = "Harvest #{planting.crop.name}"
    event.ip_class    = "PUBLIC"
-    event.url = planting_url(slug: planting['slug'])
+    event.url = planting_url(slug: planting.slug)

    cal.add_event(event)
  end
@@ -6,15 +6,15 @@
    %link= plantings_url
    - @plantings.each do |planting|
      %item
-        %title #{planting['crop_name']} in #{planting['location']}
-        %pubdate= planting['created_at'].to_fs(:rfc822)
+        %title #{planting.crop_name} in #{planting.location}
+        %pubdate= planting.created_at.to_fs(:rfc822)
        %description
          :escaped
-            <p>Quantity: #{planting['quantity'] ? planting['quantity'] : 'unknown' }</p>
-            <p>Planted on: #{planting['planted_at'] ? planting['planted_at'] : 'unknown' }</p>
-            <p>Sunniness: #{planting['sunniness'] ? planting['sunniness'] : 'unknown' }</p>
-            <p>Planted from: #{planting['planted_from'] ? planting['planted_from'] : 'unknown' }</p>
+            <p>Quantity: #{planting.quantity ? planting.quantity : 'unknown' }</p>
+            <p>Planted on: #{planting.planted_at ? planting.planted_at : 'unknown' }</p>
+            <p>Sunniness: #{planting.sunniness ? planting.sunniness : 'unknown' }</p>
+            <p>Planted from: #{planting.planted_from ? planting.planted_from : 'unknown' }</p>
          :escaped_markdown
-            #{ strip_tags markdownify(planting['description']) }
-        %link= planting_url(slug: planting['slug'])
-        %guid= planting_url(slug: planting['slug'])
+            #{ strip_tags markdownify(planting.description) }
+        %link= planting_url(slug: planting.slug)
+        %guid= planting_url(slug: planting.slug)
@@ -17,6 +17,6 @@
            <p>Heirloom? #{seed.heirloom}</p>
          - if seed.tradable
            :escaped
-              <p>Will trade #{seed.tradable_to} from #{seed.location ||= 'unknown location'}</p>
+              <p>Will trade #{seed.tradable_to} from #{seed.location || 'unknown location'}</p>
        %link= seed_url(slug: seed.slug)
        %guid= seed_url(slug: seed.slug)
@@ -14,7 +14,7 @@ Bundler.require(*Rails.groups)
 module Growstuff
  class Application < Rails::Application
    # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 8.0
+    config.load_defaults 8.1

    # Rails 7.1+ requires a coder for `serialize`.
    # We set YAML as the default for compatibility with gems like Mexican Sofa.
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# JSONAPI::Resources (0.10.7) is currently incompatible with Rails 8.1
+# because ActionDispatch::Routing::Mapper::Resources::Resource.initialize now expects keyword arguments for only/except.
+# This patch ensures that it passes keyword arguments correctly.
+# Remove when https://github.com/JSONAPI-Resources/jsonapi-resources/issues/1488 is fixed
+
+if defined?(JSONAPI)
+  module ActionDispatch
+    module Routing
+      class Mapper
+        module Resources
+          class Resource
+            alias_method :original_initialize, :initialize
+
+            def initialize(entities, api_only, shallow, options = {})
+              # In Rails 8.1, initialize(entities, api_only, shallow, only: nil, except: nil, **options)
+              # and jsonapi-resources passes them in the options hash.
+              if options.is_a?(Hash)
+                only = options.delete(:only)
+                except = options.delete(:except)
+                original_initialize(entities, api_only, shallow, only: only, except: except, **options)
+              else
+                original_initialize(entities, api_only, shallow, options)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  module JSONAPI
+    module RoutingExt
+      module Mapper
+        def jsonapi_resource_scope(resource, resource_type)
+          # The original implementation uses Resource.new which we patched above.
+          # We need to make sure we don't break Rails 5/6/7/8 logic if it were to run there.
+          @scope = @scope.new(scope_level_resource: resource, jsonapi_resource: resource_type)
+
+          controller(resource.resource_scope) { yield }
+        ensure
+          @scope = @scope.parent
+        end
+      end
+    end
+  end
+end
@@ -4,9 +4,9 @@ class Rack::Attack
  ### Throttle Config ###

  if Rails.env.production?
-    # Throttle requests to /plantings, /harvests, and /members to 10 per minute per IP
+    # Throttle requests to /plantings, /harvests, and /members to 15 per minute per IP
    # Includes API routes
-    throttle('req/ip/restricted_routes', limit: 20, period: 1.minute) do |req|
+    throttle('req/ip/restricted_routes', limit: 15, period: 1.minute) do |req|
      if req.path =~ %r{^/(plantings|harvests|members)(/|$)} || req.path =~ %r{^/api/v1/(plantings|harvests|members)(/|$)}
        req.ip
      end
@@ -27,6 +27,11 @@ class Rack::Attack
    end
  end

+  # Abusive services
+  blocklist('block Semrush crawler') do |request|
+    request.user_agent.to_s.downcase.include?('semrush')
+  end
+  
  ### Custom Response Headers ###

  # Add Retry-After header to throttled responses
@@ -4,12 +4,6 @@ class ElasticIndexing < ActiveRecord::Migration[5.2]
  def up
    say 'indexing crops'
    Crop.reindex
-    say 'indexing plantings'
-    Planting.reindex
-    say 'indexing seeds'
-    Seed.reindex
-    say 'indexing harvests'
-    Harvest.reindex
    say 'indexing photos'
    Photo.reindex
  end
@@ -4,8 +4,5 @@ namespace :search do
  desc 'reindex'
  task reindex: :environment do
    Crop.reindex
-    Planting.reindex
-    Harvest.reindex
-    Seed.reindex
  end
 end
@@ -2,7 +2,7 @@

 require 'rails_helper'

-describe HarvestsController, :search do
+describe HarvestsController do
  login_member

  def valid_attributes
@@ -22,14 +22,12 @@ describe HarvestsController, :search do
    let!(:tomato_harvest)   { create(:harvest, owner_id: first_member.id, crop_id: tomato.id)  }
    let!(:maize_harvest)    { create(:harvest, owner_id: second_member.id, crop_id: maize.id)  }

-    before { Harvest.reindex }
-
    describe "assigns all harvests as @harvests" do
      before { get :index, params: {} }

      it { expect(assigns(:harvests).size).to eq 2 }
-      it { expect(assigns(:harvests)[0].slug).to eq tomato_harvest.slug }
-      it { expect(assigns(:harvests)[1].slug).to eq maize_harvest.slug }
+      it { expect(assigns(:harvests)).to include(tomato_harvest) }
+      it { expect(assigns(:harvests)).to include(maize_harvest) }
    end

    describe "picks up owner from params and shows owner's harvests only" do
@@ -2,7 +2,7 @@

 require 'rails_helper'

-describe PlantingsController, :search do
+describe PlantingsController do
  login_member

  def valid_attributes
@@ -12,7 +12,7 @@ describe PlantingsController, :search do
    }
  end

-  describe "GET index", :search do
+  describe "GET index" do
    let!(:first_member)      { create(:member)                                                       }
    let!(:second_member)     { create(:member)                                                       }
    let!(:tomato)            { create(:tomato)                                                       }
@@ -20,16 +20,12 @@ describe PlantingsController, :search do
    let!(:tomato_planting)   { create(:planting, crop: tomato, owner: first_member, created_at: 1.day.ago) }
    let!(:maize_planting)    { create(:planting, crop: maize, owner: second_member, created_at: 5.days.ago) }

-    before do
-      Planting.reindex
-    end
-
    describe "assigns all plantings as @plantings" do
      before { get :index }

      it { expect(assigns(:plantings).size).to eq 2 }
-      it { expect(assigns(:plantings)[0]['slug']).to eq tomato_planting.slug }
-      it { expect(assigns(:plantings)[1]['slug']).to eq maize_planting.slug }
+      it { expect(assigns(:plantings)[0].slug).to eq tomato_planting.slug }
+      it { expect(assigns(:plantings)[1].slug).to eq maize_planting.slug }
    end

    describe "picks up owner from params and shows owner's plantings only" do
@@ -37,14 +33,14 @@ describe PlantingsController, :search do

      it { expect(assigns(:owner)).to eq first_member }
      it { expect(assigns(:plantings).size).to eq 1 }
-      it { expect(assigns(:plantings).first['slug']).to eq tomato_planting.slug }
+      it { expect(assigns(:plantings).first.slug).to eq tomato_planting.slug }
    end

    describe "picks up crop from params and shows the plantings for the crop only" do
      before { get :index, params: { crop_slug: maize.slug } }

      it { expect(assigns(:crop)).to eq maize }
-      it { expect(assigns(:plantings).first['slug']).to eq maize_planting.slug }
+      it { expect(assigns(:plantings).first.slug).to eq maize_planting.slug }
    end
  end

@@ -2,13 +2,12 @@

 require 'rails_helper'

-describe SeedsController, :search do
+describe SeedsController do
  let(:owner) { create(:member) }

  describe "GET index" do
    describe "picks up owner from params" do
      before do
-        Seed.reindex
        get :index, params: { member_slug: owner.slug }
      end

@@ -25,7 +24,6 @@ describe SeedsController, :search do
      let!(:planting) { create(:planting, owner:) }

      before do
-        Seed.reindex
        get :new, params: { planting_slug: planting.to_param }
      end

@@ -29,8 +29,5 @@ FactoryBot.define do
  end

  trait :reindex do
-    after(:create) do |harvest, _evaluator|
-      harvest.reindex(refresh: true)
-    end
  end
 end
@@ -68,11 +68,5 @@ FactoryBot.define do
        planting.save
      end
    end
-
-    trait :reindex do
-      after(:create) do |planting, _evaluator|
-        planting.reindex(refresh: true)
-      end
-    end
  end
 end
@@ -31,11 +31,5 @@ FactoryBot.define do
    factory :untradable_seed do
      tradable_to { "nowhere" }
    end
-
-    trait :reindex do
-      after(:create) do |seed, _evaluator|
-        seed.reindex(refresh: true)
-      end
-    end
  end
 end
@@ -2,7 +2,7 @@

 require 'rails_helper'

-describe "browse harvests", :search do
+describe "browse harvests" do
  subject { page }

  let!(:harvest) { create(:harvest, owner: member) }
@@ -11,10 +11,9 @@ describe "browse harvests", :search do
    include_context 'signed in member'

    describe 'blank optional fields' do
-      let!(:harvest) { create(:harvest, :no_description, :reindex) }
+      let!(:harvest) { create(:harvest, :no_description) }

      before do
-        Harvest.reindex
        visit harvests_path
      end

@@ -24,10 +23,9 @@ describe "browse harvests", :search do
    end

    describe "filled in optional fields" do
-      let!(:harvest) { create(:harvest, :long_description, :reindex) }
+      let!(:harvest) { create(:harvest, :long_description) }

      before do
-        Harvest.reindex
        visit harvests_path
      end

@@ -2,7 +2,7 @@

 require 'rails_helper'

-describe "home page", :search do
+describe "home page" do
  subject { page }

  let(:member) { create(:member) }
@@ -14,9 +14,9 @@ describe "home page", :search do
  let(:seed)    { create(:tradable_seed, owner: member, crop:) }
  let(:harvest) { create(:harvest, owner: member, crop:)       }

-  let!(:tradable_seed) { create(:tradable_seed, :reindex, finished: false)  }
-  let!(:finished_seed)   { create(:tradable_seed, :reindex, finished: true) }
-  let!(:untradable_seed) { create(:untradable_seed, :reindex)               }
+  let!(:tradable_seed) { create(:tradable_seed, finished: false)  }
+  let!(:finished_seed)   { create(:tradable_seed, finished: true) }
+  let!(:untradable_seed) { create(:untradable_seed)               }

  before do
    # Add photos, so they can appear on home page
@@ -25,9 +25,6 @@ describe "home page", :search do
    harvest.photos << photo

    Crop.reindex
-    Planting.reindex
-    Seed.reindex
-    Harvest.reindex

    visit root_path
  end
@@ -8,7 +8,7 @@ describe 'Likeable', :js, :search do
  let!(:activity)       { create(:activity, :reindex, owner: member) }
  let!(:photo)          { create(:photo, owner: member) }
  let!(:harvest)        { create(:harvest, :reindex, owner: member) }
-  let!(:planting)       { create(:planting, :reindex, owner: member) }
+  let!(:planting)       { create(:planting, owner: member) }

  include_context 'signed in member'

@@ -10,8 +10,6 @@ describe "Planting a crop", :js, :search do
    create(:planting, garden:, owner: member, planted_at: Date.parse("2013-03-10"))
  end

-  before { Planting.reindex }
-
  context 'signed in' do
    include_context 'signed in member'
    before { visit new_planting_path }
@@ -223,9 +221,6 @@ describe "Planting a crop", :js, :search do
      expect(page).to have_content "Aug 2014"
      expect(page).to have_content "4/5"

-      # ensure we've indexed in elastic search
-      planting.reindex(refresh: true)
-
      # shouldn't be on the page
      visit plantings_path
      expect(page).to have_no_content "maize"
@@ -9,7 +9,6 @@ describe 'Plantings RSS feed' do
  end

  it 'The index title is what we expect' do
-    Planting.reindex
    visit plantings_path(format: 'rss')
    expect(page).to have_content "Recent plantings from " \
                                 "#{@owner || 'all members'} (#{ENV.fetch('GROWSTUFF_SITE_NAME', nil)})"
@@ -148,6 +148,19 @@ describe Harvest do
    end
  end

+  describe '.homepage_records' do
+    it 'returns unique harvests per owner' do
+      member1 = create(:member)
+      member2 = create(:member)
+      create(:harvest, owner: member1, created_at: 1.day.ago)
+      h2 = create(:harvest, owner: member1, created_at: 1.hour.ago)
+      h3 = create(:harvest, owner: member2, created_at: 2.hours.ago)
+
+      records = described_class.homepage_records(5)
+      expect(records).to contain_exactly(h2, h3)
+    end
+  end
+
  context "stringification" do
    let(:crop) { create(:crop, name: "apricot") }

@@ -421,6 +421,25 @@ describe Planting do
      planting.photos << @photo2
      expect(planting.default_photo).to eq @photo2
    end
+
+    describe '#thumbnail_url' do
+      let(:crop_photo) { create(:photo) }
+
+      it 'returns its own default photo if present' do
+        expect(planting.thumbnail_url).to eq photo.fullsize_url
+      end
+
+      it 'falls back to crop default photo if no planting photo is present' do
+        planting_without_photo = create(:planting, crop:)
+        PhotoAssociation.create!(photo: crop_photo, photographable: crop)
+        expect(planting_without_photo.thumbnail_url).to eq crop_photo.fullsize_url
+      end
+
+      it 'returns nil if neither planting nor crop has a photo' do
+        planting_without_photo = create(:planting, crop:)
+        expect(planting_without_photo.thumbnail_url).to be_nil
+      end
+    end
  end

  context 'interesting plantings' do
@@ -596,16 +615,14 @@ describe Planting do
    it { expect(member.plantings.active).not_to include(failed_planting) }
  end

-  describe 'homepage', :search do
+  describe 'homepage' do
    subject { described_class.homepage_records(100) }

-    let!(:interesting_planting) { create(:planting, :reindex, :with_photo) }
-    let!(:finished_interesting_planting) { create(:finished_planting, :reindex, :with_photo) }
-    let!(:planting) { create(:planting, :reindex) }
-
-    before { described_class.reindex }
+    let!(:interesting_planting) { create(:planting, :with_photo) }
+    let!(:finished_interesting_planting) { create(:finished_planting, :with_photo) }
+    let!(:planting) { create(:planting) }

    it { expect(subject.count).to eq 3 }
-    it { expect(subject.map(&:id)).to eq([interesting_planting.id.to_s, finished_interesting_planting.id.to_s, planting.id.to_s]) }
+    it { expect(subject.map(&:id)).to include(interesting_planting.id, finished_interesting_planting.id, planting.id) }
  end
 end
@@ -213,16 +213,14 @@ describe Seed do
    end
  end

-  describe 'homepage', :search do
+  describe 'homepage' do
    subject { described_class.homepage_records(100) }

-    let!(:tradable_seed) { create(:tradable_seed, :reindex, finished: false)  }
-    let!(:finished_seed)   { create(:tradable_seed, :reindex, finished: true) }
-    let!(:untradable_seed) { create(:untradable_seed, :reindex)               }
-
-    before { described_class.reindex }
+    let!(:tradable_seed) { create(:tradable_seed, finished: false)  }
+    let!(:finished_seed)   { create(:tradable_seed, finished: true) }
+    let!(:untradable_seed) { create(:untradable_seed)               }

    it { expect(subject.count).to eq 1 }
-    it { expect(subject.first.id).to eq tradable_seed.id.to_s }
+    it { expect(subject.first.id).to eq tradable_seed.id }
  end
 end
@@ -15,7 +15,7 @@ describe "Plantings" do
    before do
      @member = create(:interesting_member)

-      @predictable_planting = create(:predictable_planting, owner: @member, planted_at: 1.days.ago, days_to_first_harvest: 10,
+      @predictable_planting = create(:predictable_planting, owner: @member, planted_at: 1.day.ago, days_to_first_harvest: 10,
 days_to_last_harvest: 20)
      @predictable_planting.crop.update(median_days_to_first_harvest: 10)

@@ -24,7 +24,6 @@ days_to_last_harvest: 20)
      @finished_planting = create(:finished_planting, owner: @member)
      @annual_planting = create(:annual_planting, owner: @member)
      @perennial_planting = create(:perennial_planting, owner: @member)
-      Planting.reindex
    end

    describe "GET /members/x/plantings.ics" do
@@ -34,19 +33,17 @@ days_to_last_harvest: 20)
        calendar = Icalendar::Parser.new(response.body, true).parse.first
        expect(calendar.description[0].to_s).to eq "Plantings by #{@member.login_name}"
        events = calendar.events
-        expect(events.length).to eq 7 # There are 8, but finished plantings aren't included
+        expect(events.length).to eq 7

-        # TODO: Better date comparison
-        # Predicted finish should be used
-        expect(events[1].summary.to_s).to include @predictable_planting.crop.name
-        expect(events[1].dtstart.to_datetime.to_i).to be_within(1.second).of @predictable_planting.created_at.to_i
-        expect(events[1].dtend.to_date).to eq @predictable_planting.finish_predicted_at
+        predictable_event = events.find { |e| e.dtend.to_date == @predictable_planting.finish_predicted_at }
+        expect(predictable_event.summary.to_s).to include @predictable_planting.crop.name
+        expect(predictable_event.dtstart.to_datetime.to_i).to be_within(1.second).of @predictable_planting.created_at.to_i

        # Actual finish should be used
-        # expect(events[4].dtend.to_date).to be_within(1.second).of @finised_planting.finished_at
+        # expect(events[4].dtend.to_date).to be_within(1.second).of @finished_planting.finished_at

        # Otherwise, tomorrow should be used
-        expect(events[3].dtend.to_date).to eq 1.day.from_now.to_date
+        expect(events.map { |e| e.dtend.to_date }).to include 1.day.from_now.to_date

        # TBA: Perennial and annual crops predictions of 'next' harvest date don't really fit

@@ -86,16 +83,18 @@ days_to_last_harvest: 20)
        data = CSV.parse(response.body, headers: true)
        expect(data.headers).to eq expected_headers

-        expect(data[1]["Crop name"]).to eq @predictable_planting.crop.name
-        expect(data[1]["Owner name"]).to eq @member.to_s
-        expect(data[1]["Garden name"]).to eq @predictable_planting.garden.to_s
-        expect(data[1]["Description"]).to eq @predictable_planting.description
-        expect(data[1]["Date planted"]).to eq @predictable_planting.planted_at.to_fs(:db)
-        expect(data[1]["Quantity"].to_i).to eq @predictable_planting.quantity
-        expect(data[1]["Sunniness"]).to eq @predictable_planting.sunniness
-        expect(data[1]["Planted from"]).to eq @predictable_planting.planted_from
-        expect(data[1]["Date added"]).to eq @predictable_planting.created_at.to_fs(:db)
-        expect(data[1]["License"]).to eq "CC-BY-SA Growstuff http://growstuff.org/"
+        row = data.detect { |crop_name| @predictable_planting.id.to_s == crop_name['Id'] }
+
+        expect(row["Crop name"]).to eq @predictable_planting.crop.name
+        expect(row["Owner name"]).to eq @member.to_s
+        expect(row["Garden name"]).to eq @predictable_planting.garden.to_s
+        expect(row["Description"]).to eq @predictable_planting.description
+        expect(row["Date planted"]).to eq @predictable_planting.planted_at.to_fs(:db)
+        expect(row["Quantity"].to_i).to eq @predictable_planting.quantity
+        expect(row["Sunniness"]).to eq @predictable_planting.sunniness
+        expect(row["Planted from"]).to eq @predictable_planting.planted_from
+        expect(row["Date added"]).to eq @predictable_planting.created_at.to_fs(:db)
+        expect(row["License"]).to eq "CC-BY-SA Growstuff http://growstuff.org/"

        expect(data.count).to eq 6
      end
@@ -46,9 +46,6 @@ RSpec.configure do |config|
  def index_everything
    # reindex models
    Crop.reindex
-    Harvest.reindex
-    Planting.reindex
-    Seed.reindex
  end

  config.before(:suite) do
@@ -61,7 +58,9 @@ RSpec.configure do |config|
  config.around(:each, :search) do |example|
    Searchkick.callbacks(true) do
      index_everything
+
      example.run
+
      index_everything
    end
  end
@@ -2,7 +2,7 @@

 require 'rails_helper'

-describe 'harvests/index.rss.haml', :search do
+describe 'harvests/index.rss.haml' do
  before do
    controller.stub(:current_user) { nil }
    @member = create(:member)
@@ -12,8 +12,7 @@ describe 'harvests/index.rss.haml', :search do
    @harvest2 = create(:harvest, crop: @tomato)
    @harvest3 = create(:harvest, crop: @tomato)

-    Harvest.searchkick_index.refresh
-    assign(:harvests, Harvest.search(load: false))
+    assign(:harvests, Harvest.all)
  end

  context 'all harvests' do
@@ -2,12 +2,11 @@

 require 'rails_helper'

-describe 'home/_seeds.html.haml', :search, type: "view" do
+describe 'home/_seeds.html.haml', type: "view" do
  let!(:seed) { create(:tradable_seed, owner:) }
  let(:owner) { create(:london_member) }

  before do
-    Seed.searchkick_index.refresh
    render
  end

@@ -2,9 +2,9 @@

 require 'rails_helper'

-describe 'plantings/index.rss.haml', :search do
+describe 'plantings/index.rss.haml' do
  before do
-    controller.stub(:current_user) { nil }
+    allow(view).to receive(:current_user).and_return(nil)
  end

  context 'all plantings' do
@@ -12,8 +12,7 @@ describe 'plantings/index.rss.haml', :search do
      @planting = create(:planting)
      @sunny = create(:sunny_planting)
      @seedling = create(:seedling_planting)
-      Planting.searchkick_index.refresh
-      assign(:plantings, Planting.search(load: false))
+      assign(:plantings, Planting.all)
      render
    end

@@ -2,7 +2,7 @@

 require 'rails_helper'

-describe 'seeds/index.rss.haml', :search do
+describe 'seeds/index.rss.haml' do
  before do
    controller.stub(:current_user) { nil }
  end
@@ -26,8 +26,7 @@ describe 'seeds/index.rss.haml', :search do
    let!(:tradable) { create(:tradable_seed) }

    before do
-      Seed.searchkick_index.refresh
-      assign(:seeds, Seed.search(load: false))
+      assign(:seeds, Seed.all)
      render
    end

@@ -51,8 +50,7 @@ describe 'seeds/index.rss.haml', :search do

    before do
      assign(:owner, seed.owner)
-      Seed.searchkick_index.refresh
-      assign(:seeds, Seed.search(load: false))
+      assign(:seeds, Seed.all)
      render
    end
@@ -1 +1 @@
 .4.9
 .0.6