feat: Improve Swagger documentation

This commit improves the Swagger documentation by using rswag to generate it from the request specs.

The following changes were made:
- All request specs in `spec/requests/api/v1/` were updated to use the rswag DSL.
- The `spec/swagger_helper.rb` was configured to generate a `swagger.json` file.
- The `config/database.yml` was updated to use environment variables, which makes it easier to use in different environments.
- The generated `swagger.json` file is now based on the OpenAPI 3.0 specification.

.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

.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: |
@@ -68,27 +68,13 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
+
       - name: Install required OS packages
         run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+          sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
           node-version: '12'
 
@@ -117,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -71,25 +71,10 @@ jobs:
 
       - name: Install required OS packages
         run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+          sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
           node-version: '12'
 
@@ -118,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -71,25 +71,10 @@ jobs:
 
       - name: Install required OS packages
         run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+          sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
           node-version: '12'
 
@@ -118,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -71,25 +71,10 @@ jobs:
 
       - name: Install required OS packages
         run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+          sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
           node-version: '12'
 
@@ -118,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -71,25 +71,10 @@ jobs:
 
       - name: Install required OS packages
         run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+          sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
           node-version: '12'
 
@@ -118,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -71,25 +71,10 @@ jobs:
 
       - name: Install required OS packages
         run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+          sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
           node-version: '12'
 
@@ -118,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -71,25 +71,10 @@ jobs:
 
       - name: Install required OS packages
         run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+          sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
           node-version: '12'
 
@@ -118,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -71,25 +71,10 @@ jobs:
 
       - name: Install required OS packages
         run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+          sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
           node-version: '12'
 
@@ -118,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -71,25 +71,10 @@ jobs:
 
       - name: Install required OS packages
         run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+          sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
           node-version: '12'
 
@@ -118,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -71,25 +71,10 @@ jobs:
 
       - name: Install required OS packages
         run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+          sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
           node-version: '12'
 
@@ -118,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
         with:
           node-version: '12'
 
@@ -86,24 +86,8 @@ jobs:
       - name: Install required JS packages
         run: yarn install
 
-      - name: Install required OS packages
-        run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+      - name: install chrome
+        run: sudo apt-get install google-chrome-stable
 
       - name: Prepare database for testing
         run: bundle exec rails db:prepare
@@ -119,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
         with:
           node-version: '12'
 
@@ -86,24 +86,8 @@ jobs:
       - name: Install required JS packages
         run: yarn install
 
-      - name: Install required OS packages
-        run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+      - name: install chrome
+        run: sudo apt-get install google-chrome-stable
 
       - name: Prepare database for testing
         run: bundle exec rails db:prepare
@@ -119,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
         with:
           node-version: '12'
 
@@ -86,24 +86,8 @@ jobs:
       - name: Install required JS packages
         run: yarn install
 
-      - name: Install required OS packages
-        run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+      - name: install chrome
+        run: sudo apt-get install google-chrome-stable
 
       - name: Prepare database for testing
         run: bundle exec rails db:prepare
@@ -119,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
         with:
           node-version: '12'
 
@@ -86,24 +86,8 @@ jobs:
       - name: Install required JS packages
         run: yarn install
 
-      - name: Install required OS packages
-        run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+      - name: install chrome
+        run: sudo apt-get install google-chrome-stable
 
       - name: Prepare database for testing
         run: bundle exec rails db:prepare
@@ -128,7 +112,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
   contributors:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - name: Install ruby version specified in .ruby-version
         uses: ruby/setup-ruby@v1
         with:
@@ -53,7 +53,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -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@v5
         with:
           node-version: '12'
 
@@ -101,24 +101,8 @@ jobs:
       - name: Install required JS packages
         run: yarn install
 
-      - name: Install required OS packages
-        run: |
-          sudo apt-get -y install libpq-dev
-
-      - name: Cache Playwright Chromium browser
-        id: playwright-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-      - name: Install Playwright Chromium browser (with deps)
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: yarn run playwright install --with-deps chromium
-
-      - name: Install Playwright Chromium browser deps
-        if: steps.playwright-cache.outputs.cache-hit == 'true'
-        run: yarn run playwright install-deps chromium
+      - name: install chrome
+        run: sudo apt-get install google-chrome-stable
 
       - name: Prepare database for testing
         run: bundle exec rails db:prepare

Gemfile

@@ -136,11 +136,6 @@ gem "gbifrb"
 
 gem "msgpack"
 
-# Pinned due to RAILS_ENV=production bundle exec rake assets:precompile failing with ArgumentError: wrong number of arguments (given 1, expected 0) (ArgumentError)
-# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/connection_pool-3.0.2/lib/connection_pool.rb:48:in `initialize'
-# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/activesupport-7.2.3/lib/active_support/cache/mem_cache_store.rb:63:in `new'
-gem "connection_pool", "< 3" 
-
 group :production do
   gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
   gem 'dalli'
@@ -192,21 +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 'capybara-playwright-driver'
+  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 'sitemap_generator'
-gem 'aws-sdk-s3', '~> 1', '>= 1.114.0'

Gemfile.lock

@@ -33,49 +33,47 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.3)
-      actionpack (= 7.2.3)
-      activesupport (= 7.2.3)
+    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)
-      actionpack (= 7.2.3)
-      activejob (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    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)
-      actionpack (= 7.2.3)
-      actionview (= 7.2.3)
-      activejob (= 7.2.3)
-      activesupport (= 7.2.3)
+    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)
-      actionview (= 7.2.3)
-      activesupport (= 7.2.3)
-      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)
-      actionpack (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    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)
-      activesupport (= 7.2.3)
+    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)
@@ -84,27 +82,27 @@ GEM
       addressable
     active_median (0.6.0)
       activesupport (>= 7.1)
-    active_record_union (1.4.0)
-      activerecord (>= 6.0)
-    active_utils (3.6.0)
+    active_record_union (1.3.0)
+      activerecord (>= 4.0)
+    active_utils (3.5.0)
       activesupport (>= 4.2)
       i18n
-    activejob (7.2.3)
-      activesupport (= 7.2.3)
+    activejob (7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.3.6)
-    activemodel (7.2.3)
-      activesupport (= 7.2.3)
-    activerecord (7.2.3)
-      activemodel (= 7.2.3)
-      activesupport (= 7.2.3)
+    activemodel (7.2.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)
-      actionpack (= 7.2.3)
-      activejob (= 7.2.3)
-      activerecord (= 7.2.3)
-      activesupport (= 7.2.3)
+    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)
+    activesupport (7.2.2.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -121,34 +119,15 @@ GEM
     ast (2.4.3)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    aws-eventstream (1.4.0)
-    aws-partitions (1.1189.0)
-    aws-sdk-core (3.239.2)
-      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.118.0)
-      aws-sdk-core (~> 3, >= 3.239.1)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.205.0)
-      aws-sdk-core (~> 3, >= 3.234.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.0)
+    axe-core-api (4.10.3)
       dumb_delegator
       ostruct
       virtus
-    axe-core-capybara (4.11.0)
-      axe-core-api (= 4.11.0)
+    axe-core-capybara (4.10.3)
+      axe-core-api (= 4.10.3)
       dumb_delegator
-    axe-core-rspec (4.11.0)
-      axe-core-api (= 4.11.0)
+    axe-core-rspec (4.10.3)
+      axe-core-api (= 4.10.3)
       dumb_delegator
       ostruct
       virtus
@@ -158,12 +137,12 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.3.0)
     bcrypt (3.1.20)
-    benchmark (0.5.0)
+    benchmark (0.4.1)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.3.1)
+    bigdecimal (3.2.3)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (7.0.1)
       elasticsearch-model (< 8)
@@ -177,7 +156,7 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.3.0)
-    bullet (8.1.0)
+    bullet (8.0.8)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (12.0.0)
@@ -194,10 +173,6 @@ GEM
     capybara-email (3.0.2)
       capybara (>= 2.4, < 4.0)
       mail
-    capybara-playwright-driver (0.5.7)
-      addressable
-      capybara
-      playwright-ruby-client (>= 1.16.0)
     capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
@@ -208,8 +183,7 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    cgi (0.5.0)
-    chartkick (5.2.1)
+    chartkick (5.2.0)
     childprocess (5.0.0)
     coderay (1.1.3)
     coercible (1.0.0)
@@ -224,7 +198,7 @@ GEM
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.5)
+    connection_pool (2.5.4)
     crass (1.0.6)
     crowdin-api (1.12.0)
       open-uri (>= 0.1.0, < 0.2.0)
@@ -234,7 +208,7 @@ 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
@@ -245,7 +219,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.5.0)
+    date (3.4.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     devise (4.9.4)
@@ -258,9 +232,9 @@ GEM
     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)
@@ -277,7 +251,7 @@ GEM
     elasticsearch-transport (7.0.0)
       faraday
       multi_json
-    erb (6.0.0)
+    erb (5.0.2)
     erubi (1.13.1)
     erubis (2.7.0)
     excon (1.2.5)
@@ -288,9 +262,9 @@ GEM
     factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
-    faker (3.5.3)
+    faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.0)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -300,10 +274,10 @@ GEM
     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)
@@ -311,21 +285,21 @@ 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.1.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.67.0)
+    haml_lint (0.66.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
@@ -350,21 +324,20 @@ GEM
       multi_xml (>= 0.5.2)
     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.1)
+    icalendar (2.11.2)
       base64
       ice_cube (~> 0.16)
       logger
@@ -375,19 +348,17 @@ GEM
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.8.1)
-    irb (1.15.3)
+    irb (1.15.2)
       pp (>= 0.6.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.16.0)
-    json-schema (6.0.0)
+    json (2.13.2)
+    json-schema (5.1.0)
       addressable (~> 2.8)
-      bigdecimal (~> 3.1)
     jsonapi-resources (0.10.7)
       activerecord (>= 4.1)
       concurrent-ruby
@@ -413,8 +384,7 @@ GEM
     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
@@ -441,7 +411,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.26.2)
+    minitest (5.25.5)
     moneta (1.0.0)
     msgpack (1.8.0)
     multi_json (1.15.0)
@@ -449,7 +419,7 @@ GEM
       bigdecimal (~> 3.1)
     net-http (0.6.0)
       uri
-    net-imap (0.5.12)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
@@ -459,14 +429,14 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     netrc (0.11.0)
-    nio4r (2.7.5)
-    nokogiri (1.18.10)
+    nio4r (2.7.4)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.13)
+    oj (3.16.11)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -481,11 +451,8 @@ 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 (1.27.0)
-    parser (3.3.10.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     percy-capybara (5.0.0)
@@ -496,26 +463,23 @@ GEM
       heroics (~> 0.1.1)
       moneta (~> 1.0.0)
       rate_throttle_client (~> 0.1.0)
-    playwright-ruby-client (1.57.0)
-      concurrent-ruby (>= 1.1.6)
-      mime-types (>= 3.0)
     popper_js (2.11.8)
-    pp (0.6.3)
+    pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.6.0)
+    prism (1.4.0)
     pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     psych (5.2.6)
       date
       stringio
-    public_suffix (6.0.2)
-    puma (7.1.0)
+    public_suffix (6.0.1)
+    puma (7.0.2)
       nio4r (~> 2.0)
-    query_diet (0.7.3)
+    query_diet (0.7.2)
     racc (1.8.1)
-    rack (2.2.21)
+    rack (2.2.17)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -528,20 +492,20 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.2.3)
-      actioncable (= 7.2.3)
-      actionmailbox (= 7.2.3)
-      actionmailer (= 7.2.3)
-      actionpack (= 7.2.3)
-      actiontext (= 7.2.3)
-      actionview (= 7.2.3)
-      activejob (= 7.2.3)
-      activemodel (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    rails (7.2.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)
+      railties (= 7.2.2.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -561,44 +525,39 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.2.3)
-      actionpack (= 7.2.3)
-      activesupport (= 7.2.3)
-      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.3.1)
+    rake (13.3.0)
     rate_throttle_client (0.1.2)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.17.0)
+    rdoc (6.14.2)
       erb
       psych (>= 4.0.0)
-      tsort
-    recaptcha (5.21.1)
+    recaptcha (5.20.1)
     redis-client (0.23.2)
       connection_pool
-    regexp_parser (2.11.3)
-    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)
@@ -608,7 +567,7 @@ 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)
@@ -626,23 +585,23 @@ GEM
       rspec-support (~> 3.13)
     rspec-rebound (0.2.1)
       rspec-core (~> 3.3)
-    rspec-support (3.13.6)
+    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.81.7)
+    rswag-ui (2.16.0)
+      actionpack (>= 5.2, < 8.1)
+      railties (>= 5.2, < 8.1)
+    rubocop (1.80.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -650,19 +609,19 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.48.0)
+    rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
       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.2)
+    rubocop-rails (2.33.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -671,10 +630,10 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.8.0)
+    rubocop-rspec (3.7.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.81)
-    rubocop-rspec_rails (2.32.0)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
       rubocop-rspec (~> 3.5)
@@ -682,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)
@@ -696,13 +655,13 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (6.0.0)
+    scout_apm (5.7.1)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.39.0)
+    selenium-webdriver (4.35.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -715,8 +674,6 @@ GEM
       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)
@@ -726,7 +683,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.1.9)
+    stringio (3.1.7)
     sysexits (1.2.0)
     temple (0.10.4)
     terminal-table (4.0.0)
@@ -737,17 +694,16 @@ GEM
     thread_safe (0.3.6)
     tilt (2.6.1)
     timecop (0.9.10)
-    timeout (0.5.0)
-    tsort (0.2.0)
+    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.1.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)
+    uniform_notifier (1.17.0)
     uri (1.0.3)
     useragent (0.16.11)
     validate_url (1.0.15)
@@ -765,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
@@ -788,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
@@ -803,12 +758,10 @@ DEPENDENCIES
   cancancan
   capybara
   capybara-email
-  capybara-playwright-driver
   capybara-screenshot
   chartkick
   coffee-rails
   comfortable_mexican_sofa!
-  connection_pool (< 3)
   crowdin-cli
   csv_shaper
   dalli
@@ -850,7 +803,6 @@ DEPENDENCIES
   oj
   omniauth (~> 1.3)
   omniauth-flickr (>= 0.0.15)
-  paper_trail (~> 17.0)
   percy-capybara (~> 5.0.0)
   pg
   platform-api
@@ -886,7 +838,6 @@ DEPENDENCIES
   searchkick
   selenium-webdriver
   sidekiq
-  sitemap_generator
   sprockets (< 4)
   terser
   timecop

README.md

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

app/assets/stylesheets/_homepage.scss

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

app/assets/stylesheets/application.scss

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

app/controllers/activities_controller.rb

@@ -24,17 +24,6 @@ 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
 
@@ -43,10 +32,6 @@ class ActivitiesController < DataController
       owner:    current_member,
       due_date: Date.today
     )
-    @activity.name = params[:name] if params[:name]
-    @activity.description = params[:description] if params[:description]
-    @activity.category = params[:category] if params[:category]
-    @activity.due_date = params[:due_date] if params[:due_date]
     if params[:garden_id]
       @activity.garden = Garden.find_by(
         owner: current_member,
@@ -73,21 +58,7 @@ class ActivitiesController < DataController
   def create
     @activity = Activity.new(activity_params)
     @activity.owner = current_member
-    @activity.due_date ||= Date.today
-
-    if @activity.save
-      if params[:repeat_times].to_i > 0
-        repeat_times = params[:repeat_times].to_i
-        repeat_weeks = params[:repeat_weeks].to_i
-
-        repeat_times.times do |i|
-          new_activity = @activity.dup
-          new_activity.due_date = @activity.due_date + (i + 1) * repeat_weeks.weeks
-          new_activity.save
-        end
-      end
-    end
-
+    @activity.save
     respond_with @activity
   end
 
@@ -106,8 +77,7 @@ class ActivitiesController < DataController
   def activity_params
     params.require(:activity).permit(
       :name, :description, :category, :finished,
-      :garden_id, :planting_id, :due_date,
-      :repeat_times, :repeat_weeks
+      :garden_id, :planting_id, :due_date
     )
   end
 

app/controllers/admin/crop_companions_controller.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
-  class CropCompanionsController < AdminController
-    before_action :set_crop
-
-    def index
-      @crop_companions = @crop.crop_companions
-    end
-
-    def new
-      @crop_companion = @crop.crop_companions.new
-    end
-
-    def create
-      @crop_companion = @crop.crop_companions.new(crop_companion_params)
-      if @crop_companion.save
-        redirect_to admin_crop_crop_companions_path(@crop), notice: '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

app/controllers/admin/crops_controller.rb

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

app/controllers/admin/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

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,12 +188,10 @@ class CropsController < ApplicationController
 
   def crop_params
     params.require(:crop).permit(
-      :name, :en_wikipedia_url, :en_youtube_url,
+      :name, :en_wikipedia_url,
       :parent_id, :perennial,
       :request_notes, :reason_for_rejection,
       :rejection_notes,
-      :description,
-      :public_food_key,
       :row_spacing, :spread, :height,
       :sowing_method, :sun_requirements, :growing_degree_days,
       scientific_names_attributes: %i(scientific_name _destroy id)

app/controllers/gardens_controller.rb

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

app/controllers/home_controller.rb

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

app/controllers/plantings_controller.rb

@@ -46,12 +46,6 @@ class PlantingsController < DataController
       .where.not(id: @planting.id)
       .includes(:owner, :crop, :garden)
       .limit(6)
-
-    if @planting.finished? && @planting.garden.plantings.current.none? && (@planting.updated_at + 2.weeks) > Time.zone.now
-      @cultivate_soil_link = new_activity_path(name: 'Cultivate soil', garden_id: @planting.garden_id, category: "Soil Cultivation",
-                                               description: "Recently finished #{@planting.crop.name} planting. Prepare for next planting.")
-    end
-
     respond_with @planting
   end
 

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

app/helpers/application_helper.rb

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

app/helpers/auto_suggest_helper.rb

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

app/helpers/buttons_helper.rb

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

app/helpers/crops_helper.rb

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

app/helpers/event_helper.rb

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

app/helpers/icons_helper.rb

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

app/models/ability.rb

@@ -76,7 +76,6 @@ class Ability
     if member.role? :crop_wrangler
       can :wrangle, Crop
       can :manage, Crop
-      can :manage, CropCompanion
       can :manage, ScientificName
       can :manage, AlternateName
       can :openfarm, Crop

app/models/australian_food_classification_data.rb

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

app/models/concerns/open_farm_data.rb

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

app/models/concerns/search_harvests.rb

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

app/models/concerns/search_plantings.rb

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

app/models/crop.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Crop < ApplicationRecord
-  has_paper_trail
   extend FriendlyId
   include PhotoCapable
   include OpenFarmData
@@ -28,10 +27,6 @@ class Crop < ApplicationRecord
   has_many :companions, through: :crop_companions, source: :crop_b, class_name: 'Crop'
   has_many :crop_posts, dependent: :delete_all
   has_many :posts, through: :crop_posts, dependent: :delete_all
-  has_one :australian_food_classification_data,
-          foreign_key: :public_food_key,
-          primary_key: :public_food_key,
-          inverse_of:  :crop
 
   accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
 
@@ -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)

app/models/forum.rb

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

app/models/garden_type.rb

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

app/models/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)
 
   #
@@ -107,10 +105,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

app/models/photo.rb

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

app/models/plant_part.rb

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

app/models/planting.rb

@@ -25,8 +25,6 @@ class Planting < ApplicationRecord
   has_many :harvests, dependent: :destroy
   has_many :activities, dependent: :destroy
 
-  scope :current, -> { where.not(finished: true).where.not(failed: true) }
-
   #
   # Ancestry of food
   belongs_to :parent_seed, class_name: 'Seed', # parent,

app/models/role.rb

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

app/models/seed.rb

@@ -6,7 +6,6 @@ class Seed < ApplicationRecord
   include Finishable
   include Ownable
   include SearchSeeds
-
   friendly_id :seed_slug, use: %i(slugged finders)
 
   TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally).freeze
@@ -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

app/resources/api/v1/activity_resource.rb

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

app/resources/api/v1/crop_resource.rb

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

app/resources/api/v1/garden_resource.rb

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

app/resources/api/v1/harvest_resource.rb

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

app/resources/api/v1/member_resource.rb

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

app/resources/api/v1/photo_resource.rb

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

app/resources/api/v1/planting_resource.rb

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

app/resources/api/v1/seed_resource.rb

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

app/resources/base_resource.rb

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

app/views/activities/_actions.haml

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

app/views/activities/_card.html.haml

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

app/views/activities/_form.html.haml

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

app/views/activities/show.html.haml

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

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

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

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

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

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

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

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

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

app/views/crops/_form.html.haml

@@ -41,47 +41,19 @@
         = 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'
+      %h2 OpenFarm Data
+      = f.number_field :row_spacing, label: 'Row Spacing (cm)', min: 0
+      = f.number_field :spread, label: 'Spread (cm)', min: 0
+      = f.number_field :height, label: 'Height (cm)', min: 0
+      = f.text_field :sowing_method
+      = f.text_field :sun_requirements
+      = f.number_field :growing_degree_days, min: 0
 
       - 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

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

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}"

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://afcd.foodstandards.gov.au/fooddetails.aspx?PFKID=#{data.public_food_key}", target: "_blank", rel: "noopener noreferrer"

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'

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")

app/views/crops/_schema_org.html.haml

@@ -1,2 +0,0 @@
-%script{type: "application/ld+json"}
-  = crop_jsonld_data(crop).to_json.html_safe

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

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')

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

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'
 

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
@@ -136,8 +113,6 @@
 
     = render 'openfarm_data', crop: @crop
 
-    = render 'nutritional_data', crop: @crop
-
     = cute_icon
     .card
       .card-body
@@ -150,12 +125,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 +157,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

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

app/views/harvests/index.html.haml

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

app/views/harvests/show.html.haml

@@ -1,9 +1,4 @@
 = content_for :title, "#{@harvest.crop} harvested by #{@harvest.owner}"
-- content_for :meta_description do
-  - if @harvest.description.present?
-    = @harvest.description
-  - else
-    = "#{@harvest.crop} harvested by #{@harvest.owner}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: harvest_image_path(@harvest))
   = tag("meta", property: "og:image:user_generated", content: "true")
@@ -12,9 +7,6 @@
   = tag("meta", property: "og:url", content: request.original_url)
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
-%script{type: "application/ld+json"}
-  = crop_jsonld_data(@harvest.crop, full_attributes: false).to_json.html_safe
-
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Harvests', harvests_path
   %li.breadcrumb-item= link_to @harvest.owner, member_harvests_path(@harvest.owner)
@@ -76,4 +68,3 @@
 
     .col-md-4.col-xs-12
       = render @harvest.crop
-      = render 'crops/nutritional_data', crop: @harvest.crop

app/views/home/_releases.html.haml

@@ -1,11 +0,0 @@
-%section.releases
-  = cute_icon
-  - github_releases.each do |release|
-
-    %h2= link_to release[:title], release[:link], target: "_blank"
-    .card
-      .card-header
-        %small= release[:updated].to_date.to_s
-      .card-body= release[:content].html_safe
-  %p
-    = link_to 'Find out more »', 'https://github.com/Growstuff/growstuff/releases', target: "_blank", class: 'btn btn-block'

app/views/home/community_gardens.html.haml

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

app/views/home/index.html.haml

@@ -1,7 +1,5 @@
 - content_for :title do
   = ENV['GROWSTUFF_SITE_NAME']
-- content_for :meta_description do
-  Growstuff is a community of food gardeners. Let's learn to grow food together.
 
 - if member_signed_in?
   .row
@@ -64,7 +62,6 @@
     %section.members
       = cute_icon
       = render 'members', cached: true
-.row
   .col-12.col-lg-6
     %section.pwa-install
       = cute_icon
@@ -77,6 +74,4 @@
         .card
           .card-body
             %h3= t('home.pwa_android_title')
-            %p= t('home.pwa_android_steps_html')
-  .col-12.col-lg-6
-    = render 'releases'
+            %p= t('home.pwa_android_steps_html')

app/views/layouts/_head.html.haml

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

app/views/layouts/_menu.haml

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

app/views/members/show.html.haml

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

app/views/plantings/index.html.haml

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

app/views/plantings/show.html.haml

@@ -1,9 +1,4 @@
 = content_for :title, "#{@planting.crop} in #{@planting.location}"
-- content_for :meta_description do
-  - if @planting.description.present?
-    = @planting.description
-  - else
-    = "#{@planting.crop} planted in #{@planting.location} by #{@planting.owner}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: planting_image_path(@planting))
   = tag("meta", property: "og:title", content: "#{@planting.crop} in #{@planting.location}")
@@ -21,8 +16,6 @@
           "ratingValue": "#{@planting.overall_rating}",
           "bestRating": "5"
         }
-  %script{type: "application/ld+json"}
-    = crop_jsonld_data(@planting.crop, full_attributes: false).to_json.html_safe
 
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Plantings', plantings_path
@@ -89,10 +82,6 @@
 
       %section
         %h2 Current activities for planting
-        - if @cultivate_soil_link
-          .alert.alert-info
-            This was the last planting recently in this bed. Would you like to cultivate the soil soon?
-            = link_to 'Cultivate soil', @cultivate_soil_link, class: 'btn btn-secondary btn-sm ml-2'
         .index-cards
           - if @current_activities&.size&.positive?
             - @current_activities.each do |activity|

app/views/scientific_names/_form.html.haml

@@ -24,10 +24,6 @@
     = f.label :name, class: 'control-label col-md-2'
     .col-md-8
       = f.text_field :name, class: 'form-control'
-  .form-group
-    = f.label :wikidata_id, "Wikidata ID", class: 'control-label col-md-2'
-    .col-md-8
-      = f.text_field :wikidata_id, class: 'form-control', pattern: 'Q[1-9][0-9]*'
   .form-group
     .form-actions.col-md-offset-2.col-md-8
       = f.submit 'Save', class: 'btn btn-primary'

app/views/seeds/index.html.haml

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

app/views/seeds/show.html.haml

@@ -1,9 +1,4 @@
 - content_for :title, "#{@seed.owner}'s #{@seed.crop} seeds"
-- content_for :meta_description do
-  - if @seed.description.present?
-    = @seed.description
-  - else
-    = "Seeds for #{@seed.crop.name}, shared by #{@seed.owner}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: seed_image_path(@seed))
   - if @seed.description
@@ -13,8 +8,6 @@
   = tag("meta", property: "og:url", content: request.original_url)
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
-%script{type: "application/ld+json"}
-  = crop_jsonld_data(@seed.crop, full_attributes: false).to_json.html_safe
 
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Seeds', seeds_path

app/views/shared/_version_changeset.html.haml

@@ -1,17 +0,0 @@
-- if version.changeset.present?
-  .changes
-    - version.changeset.each do |field, changes|
-      - if field != "updated_at"
-        .row
-          .col-md-3
-            %strong= field.humanize
-          .col-md-9
-            - if changes[0].present?
-              %em= changes[0]
-            - else
-              %em (blank)
-            %span.text-muted ->
-            - if changes[1].present?
-              %em= changes[1]
-            - else
-              %em (blank)

config.ru

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

config/database.yml

@@ -1,31 +1,27 @@
-development:
+default: &default
   adapter: postgresql
+  encoding: unicode
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+
+development:
+  <<: *default
   database: growstuff_dev
   user: postgres
   password: postgres
-  host: db
+  host: <%= ENV.fetch("DATABASE_HOST") { 'db' } %>
+
 
 test:
-  adapter: postgresql
+  <<: *default
   database: growstuff_test
   user: postgres
   password: postgres
-  host: db
+  host: <%= ENV.fetch("DATABASE_HOST") { 'db' } %>
 
 production:
-  adapter: postgresql
-  database: growstuff_prod
-  pool: 5
-  timeout: 5000
-  username: growstuff
-  host: localhost
-  password: thisisnottherealpassword
+  <<: *default
+  url: <%= ENV['DATABASE_URL'] %>
 
 staging:
-  adapter: postgresql
-  database: growstuff_prod
-  pool: 5
-  timeout: 5000
-  username: growstuff
-  host: localhost
-  password: thisisnottherealpassword
+  <<: *default
+  url: <%= ENV['DATABASE_URL'] %>

config/initializers/jsonapi_resources.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 class UnauthorisedError < JSONAPI::Error
 end
 JSONAPI.configure do |config|

config/initializers/mailboxer.rb

@@ -5,7 +5,7 @@ Mailboxer.setup do |config|
   config.uses_emails = true
 
   # Configures the default from for emails sent for Messages and Notifications
-  config.default_from = "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', 'no-reply@growstuff.org')}>"
+  config.default_from =  "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', "no-reply@growstuff.org")}>"
 
   # Configures the methods needed by mailboxer
   # config.email_method = :email