Merge branch 'dev' into Style/SoleNestedConditional

.codeclimate.yml

@@ -0,0 +1,47 @@
+plugins:
+  brakeman:
+    enabled: false # codeclimate's brakeman is stuck in rails 5 rules
+  bundler-audit:
+    enabled: true
+  coffeelint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+      - javascript
+  editorconfig:
+    enabled: true
+  eslint:
+    enabled: true
+  fixme:
+    enabled: true
+  haml-lint:
+    enabled: true
+  nodesecurity:
+    enabled: true
+  rubocop:
+    enabled: true
+    channel: "rubocop-1-11"
+  scss-lint:
+    enabled: true
+  shellcheck:
+    enabled: true
+ratings:
+  paths:
+  - "**.rb"
+  - "**.ru"
+  - "**.js"
+  - "**.coffee"
+  - "**.scss"
+  - "**.haml"
+  - Gemfile.lock
+exclude_paths:
+- config/
+- db/
+- spec/
+- public/
+- app/assets/stylesheets/bootstrap-accessibility.css
+- app/assets/javascripts/bootstrap*
+- app/assets/stylesheets/leaflet_overrides.scss

.devcontainer/.env

@@ -1,2 +1,2 @@
 # Ruby version
-VARIANT=3.3.4
+VARIANT=3.2.4

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye
+FROM mcr.microsoft.com/devcontainers/ruby:0-3.2-bullseye
 
 # Install Rails
 RUN gem install rails:7.0.8
@@ -29,5 +29,4 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # Make sure this is writable as https://github.com/rubygems/rubygems/issues/6272 was removed
 RUN su root -c "mkdir -p /usr/local/rvm/gems/default/cache/bundler/"
 RUN su root -c "mkdir -p /usr/local/rvm/gems/default/bundler/gems/"
-RUN su root -c "chown -R vscode:rvm /usr/local/rvm/gems/"
-RUN su root -c "chmod -R 0755 /usr/local/rvm/gems/"
+RUN su root -c "chmod -R 777 /usr/local/rvm/gems/"

.github/dependabot.yml

@@ -7,10 +7,53 @@ updates:
     time: "07:00"
   open-pull-requests-limit: 20
   versioning-strategy: lockfile-only
+  ignore:
+  - dependency-name: active_median
+    versions:
+    - "< 0.2.2, >= 0.2.1.a"
+  - dependency-name: rubocop
+    versions:
+    - "< 0.63, >= 0.62.a"
+  - dependency-name: rubocop
+    versions:
+    - "< 0.64, >= 0.63.a"
+  - dependency-name: sidekiq
+    versions:
+    - 5.2.4
+  - dependency-name: oj
+    versions:
+    - 3.11.4
+  - dependency-name: listen
+    versions:
+    - 3.5.0
+  - dependency-name: rspec-rails
+    versions:
+    - 4.1.0
+    - 5.0.0
+  - dependency-name: searchkick
+    versions:
+    - 4.4.3
+  - dependency-name: rswag-api
+    versions:
+    - 2.3.3
+  - dependency-name: rswag-specs
+    versions:
+    - 2.3.3
+  - dependency-name: rswag-ui
+    versions:
+    - 2.3.3
+  - dependency-name: timecop
+    versions:
+    - 0.9.3
+  - dependency-name: puma
+    versions:
+    - 5.2.0
+  - dependency-name: capybara
+    versions:
+    - 3.35.1
 - package-ecosystem: github-actions
   directory: "/"
   schedule:
     interval: daily
     time: "07:00"
   open-pull-requests-limit: 10
-

.github/workflows/brakeman-analysis.yml

@@ -0,0 +1,40 @@
+# This workflow integrates Brakeman with GitHub's Code Scanning feature
+# Brakeman is a static analysis security vulnerability scanner for Ruby on Rails applications
+
+name: Brakeman Scan
+
+# This section configures the trigger for the workflow. Feel free to customize depending on your convention
+on:
+  pull_request:
+    branches: [ dev ]
+
+jobs:
+  brakeman-scan:
+    name: Brakeman Scan
+    runs-on: ubuntu-latest
+    steps:
+    # Checkout the repository to the GitHub Actions runner
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    # Customize the ruby version depending on your needs
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+
+    - name: Setup Brakeman
+      env:
+        BRAKEMAN_VERSION: '5.1.1' # SARIF support is provided in Brakeman version 4.10+
+      run: |
+        gem install brakeman --version $BRAKEMAN_VERSION
+
+    # Execute Brakeman CLI and generate a SARIF output with the security issues identified during the analysis
+    - name: Scan
+      continue-on-error: true
+      run: |
+        brakeman -f sarif -o output.sarif.json .
+
+    # Upload the SARIF file generated in the previous step
+    - name: Upload SARIF
+      uses: github/codeql-action/upload-sarif@v3
+      with:
+        sarif_file: output.sarif.json

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

@@ -1,102 +0,0 @@
-name: CI Features - Admin
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (admin/)
-        run: bundle exec rspec spec/features/admin/ -fd -t ~@flaky

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

@@ -1,102 +0,0 @@
-name: CI Features - Comments
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (comments/)
-        run: bundle exec rspec spec/features/comments/ -fd -t ~@flaky

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

@@ -1,103 +0,0 @@
-name: CI Features - Conversations
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (conversations/)
-        run: bundle exec rspec spec/features/conversations/ -fd -t ~@flaky
-

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

@@ -1,102 +0,0 @@
-name: CI Features - Crops
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (crops/)
-        run: bundle exec rspec spec/features/crops/ -fd -t ~@flaky

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

@@ -1,102 +0,0 @@
-name: CI Features - Gardens
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (gardens/)
-        run: bundle exec rspec spec/features/gardens/ -fd -t ~@flaky

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

@@ -1,102 +0,0 @@
-name: CI Features - Harvests
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (harvests/)
-        run: bundle exec rspec spec/features/harvests/ -fd -t ~@flaky

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

@@ -1,102 +0,0 @@
-name: CI Features - Home
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (home/)
-        run: bundle exec rspec spec/features/home/ -fd -t ~@flaky

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

@@ -1,102 +0,0 @@
-name: CI Features - Members
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (members/)
-        run: bundle exec rspec spec/features/members/ -fd -t ~@flaky

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

@@ -1,102 +0,0 @@
-name: CI Features - Admin
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (places/)
-        run: bundle exec rspec spec/features/places/ -fd

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

@@ -1,102 +0,0 @@
-name: CI Features - Plantings
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (plantings/)
-        run: bundle exec rspec spec/features/plantings/ -fd

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

@@ -1,102 +0,0 @@
-name: CI Features - Admin
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (posts/)
-        run: bundle exec rspec spec/features/posts/ -fd

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

@@ -1,102 +0,0 @@
-name: CI Features - Seeds
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (seeds/)
-        run: bundle exec rspec spec/features/seeds/ -fd -t ~@flaky

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

@@ -1,102 +0,0 @@
-name: CI Features - Timeline
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (timeline/)
-        run: bundle exec rspec spec/features/timeline/ -fd -t ~@flaky

.github/workflows/ci-features.yml

@@ -1,111 +0,0 @@
-name: CI Features
-
-on: [pull_request]
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    services:
-      db:
-        image: postgres
-        env:
-          ##
-          # The Postgres service fails its docker health check unless you
-          # specify these environment variables
-          #
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: growstuff_test
-        ports: ['5432:5432']
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
-      DEVISE_SECRET_KEY: secret
-      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey"
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
-      RAILS_ENV: test
-      RAILS_SECRET_TOKEN: supersecret
-
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v5
-
-      - name: Configure sysctl limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-
-      - name: Start Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.5.1
-
-      ##
-      # Cache Yarn modules
-      #
-      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
-      #
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Setup yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          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 google-chrome-stable
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '12'
-
-      - name: Install Ruby (version given by .ruby-version) and Bundler
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Install required JS packages
-        run: yarn install
-
-      - name: install chrome
-        run: sudo apt-get install google-chrome-stable
-
-      - name: Prepare database for testing
-        run: bundle exec rails db:prepare
-
-      - name: precompile assets
-        run: bundle exec rails assets:precompile
-
-      - name: index into elastic search
-        run: bundle exec rails search:reindex
-
-      - name: Run rspec (*_spec)
-        run: bundle exec rspec spec/features/*_spec.rb -fd
-
-      - name: Run rspec (percy/)
-        run: bundle exec rspec spec/features/percy/ -fd
-
-      - name: Run rspec (photos/)
-        run: bundle exec rspec spec/features/photos/ -fd
-
-      - name: Run rspec (rss/)
-        run: bundle exec rspec spec/features/rss/ -fd

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
   contributors:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - 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@v5
+        uses: actions/checkout@v4
 
       - name: Configure sysctl limits
         run: |
@@ -106,25 +106,17 @@ jobs:
 
       - name: Prepare database for testing
         run: bundle exec rails db:prepare
+        
+      - name: precompile assets
+        run: bundle exec rails assets:precompile
+        
+      - name: index into elastic search
+        run: bundle exec rails search:reindex
 
+      - name: Run rspec (report results to Percy.io and CodeClimate)
+        run: bundle exec rspec spec -fd
 
-      - name: Run rspec (lib)
-        run: bundle exec rspec spec/lib/ -fd --fail-fast
-
-      - name: Run rspec (services)
-        run: bundle exec rspec spec/services/ -fd --fail-fast
-
-      - name: Run rspec (models)
-        run: bundle exec rspec spec/models/ -fd --fail-fast
-
-      - name: Run rspec (controllers)
-        run: bundle exec rspec spec/controllers/ -fd --fail-fast
-
-      - name: Run rspec (views)
-        run: bundle exec rspec spec/views/ -fd --fail-fast
-
-      - name: Run rspec (routing)
-        run: bundle exec rspec spec/routing/ -fd --fail-fast
-
-      - name: Run rspec (request)
-        run: bundle exec rspec spec/requests/ -fd --fail-fast
+      - name: Report to code climate
+        run: |
+          gem install codeclimate-test-reporter
+          codeclimate-test-reporter

.rubocop.yml

@@ -11,7 +11,7 @@ AllCops:
   Exclude:
     - 'db/schema.rb'
     - 'vendor/**/*'
-  TargetRailsVersion: 7.1
+  TargetRailsVersion: 7.0
 
 Rails:
   Enabled: true

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-07-13 05:47:38 UTC using RuboCop version 1.65.0.
+# on 2024-07-13 05:22:30 UTC using RuboCop version 1.65.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -12,6 +12,13 @@
 Capybara/ClickLinkOrButtonStyle:
   Enabled: false
 
+# Offense count: 84
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: have_no, not_to
+Capybara/NegationMatcher:
+  Enabled: false
+
 # Offense count: 39
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: DefaultSelector.
@@ -81,14 +88,125 @@ FactoryBot/ExcessiveCreateList:
 FactoryBot/SyntaxMethods:
   Enabled: false
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleAlignWith.
+# SupportedStylesAlignWith: either, start_of_block, start_of_line
+Layout/BlockAlignment:
+  Exclude:
+    - 'spec/factories/activity.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowForAlignment.
+Layout/CommentIndentation:
+  Exclude:
+    - 'config/environments/production.rb'
+
+# Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'config/initializers/application_controller_renderer.rb'
+    - 'config/initializers/backtrace_silencers.rb'
+    - 'config/initializers/content_security_policy.rb'
+    - 'config/initializers/mime_types.rb'
+    - 'config/initializers/new_framework_defaults_5_2.rb'
+    - 'db/migrate/20240218053122_add_slug_to_activity.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, DefLikeMacros, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
+Layout/EmptyLineBetweenDefs:
+  Exclude:
+    - 'db/migrate/20171129041341_create_photographings.rb'
+    - 'db/migrate/20190130090437_add_crop_to_photographings.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLines:
+  Exclude:
+    - 'spec/models/ability_spec.rb'
+
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
+  Exclude:
+    - 'lib/tasks/gardens.rake'
+    - 'spec/rails_helper.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'app/models/concerns/search_activities.rb'
+    - 'app/models/concerns/search_plantings.rb'
+
+# Offense count: 10
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: space, no_space
+Layout/LineContinuationSpacing:
+  Exclude:
+    - 'app/mailers/notifier_mailer.rb'
+    - 'app/models/seed.rb'
+    - 'lib/tasks/growstuff.rake'
+    - 'spec/features/rss/plantings_spec.rb'
+    - 'spec/features/rss/posts_spec.rb'
+    - 'spec/features/rss/seeds_spec.rb'
+    - 'spec/models/seed_spec.rb'
+
+# Offense count: 9
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented
+Layout/LineEndStringConcatenationIndentation:
+  Exclude:
+    - 'app/mailers/notifier_mailer.rb'
+    - 'app/models/seed.rb'
+    - 'lib/tasks/growstuff.rake'
+    - 'spec/features/rss/plantings_spec.rb'
+    - 'spec/features/rss/posts_spec.rb'
+    - 'spec/features/rss/seeds_spec.rb'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:
     - 'app/helpers/crops_helper.rb'
     - 'db/seeds.rb'
+    - 'spec/requests/plantings_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingEmptyLines:
+  Exclude:
+    - 'spec/features/admin/newsletter_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'spec/factories/activity.rb'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Lint/AmbiguousOperatorPrecedence:
+  Exclude:
+    - 'db/seeds.rb'
+    - 'spec/helpers/gardens_helper_spec.rb'
+    - 'spec/helpers/seeds_helper_spec.rb'
 
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -158,7 +276,7 @@ Metrics/BlockLength:
 # Offense count: 7
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 188
+  Max: 183
 
 # Offense count: 6
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -605,6 +723,14 @@ Style/ClassAndModuleChildren:
     - 'lib/haml/filters/escaped_markdown.rb'
     - 'lib/haml/filters/growstuff_markdown.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Keywords, RequireColon.
+# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW, NOTE
+Style/CommentAnnotation:
+  Exclude:
+    - 'spec/features/seeds/adding_seeds_spec.rb'
+
 # Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/CommentedKeyword:
@@ -614,6 +740,12 @@ Style/CommentedKeyword:
     - 'spec/models/photo_spec.rb'
     - 'spec/models/planting_spec.rb'
 
+# Offense count: 37
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedVars.
+Style/FetchEnvVar:
+  Enabled: false
+
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
@@ -632,6 +764,33 @@ Style/GlobalStdStream:
     - 'lib/tasks/gbif.rake'
     - 'lib/tasks/openfarm.rake'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
+Style/GuardClause:
+  Exclude:
+    - 'app/controllers/activities_controller.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+# SupportedShorthandSyntax: always, never, either, consistent, either_consistent
+Style/HashSyntax:
+  Exclude:
+    - 'app/models/csv_importer.rb'
+    - 'spec/requests/api/v1/gardens_request_spec.rb'
+    - 'spec/requests/api/v1/plantings_request_spec.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+Style/IfUnlessModifier:
+  Exclude:
+    - 'app/controllers/activities_controller.rb'
+    - 'app/controllers/application_controller.rb'
+    - 'bin/setup'
+    - 'spec/features/shared_examples/crop_suggest.rb'
+
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods.
@@ -660,13 +819,18 @@ Style/MutableConstant:
   Exclude:
     - 'app/models/activity.rb'
 
-# Offense count: 5
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/NegatedIfElseCondition:
+  Exclude:
+    - 'app/helpers/crops_helper.rb'
+
+# Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
-    - 'app/helpers/crops_helper.rb'
     - 'app/helpers/harvests_helper.rb'
     - 'app/helpers/plantings_helper.rb'
     - 'app/models/concerns/predict_planting.rb'
@@ -683,6 +847,15 @@ Style/OptionalBooleanParameter:
   Exclude:
     - 'app/models/concerns/member_newsletter.rb'
 
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: same_as_string_literals, single_quotes, double_quotes
+Style/QuotedSymbols:
+  Exclude:
+    - 'app/models/seed.rb'
+    - 'spec/controllers/crops_controller_spec.rb'
+
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Methods.
@@ -690,6 +863,12 @@ Style/RedundantArgument:
   Exclude:
     - 'app/helpers/application_helper.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantConstantBase:
+  Exclude:
+    - 'config.ru'
+
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SafeForConstants.
@@ -697,12 +876,17 @@ Style/RedundantFetchBlock:
   Exclude:
     - 'config/puma.rb'
 
-# Offense count: 2
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowModifier.
-Style/SoleNestedConditional:
+Style/RedundantRegexpArgument:
+  Exclude:
+    - 'db/migrate/20191119030244_cms_tags.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
   Exclude:
-    - 'app/controllers/application_controller.rb'
     - 'app/controllers/messages_controller.rb'
 
 # Offense count: 24
@@ -716,6 +900,13 @@ Style/StringConcatenation:
     - 'spec/helpers/gardens_helper_spec.rb'
     - 'spec/helpers/seeds_helper_spec.rb'
 
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Style/SuperArguments:
+  Exclude:
+    - 'app/controllers/omniauth_callbacks_controller.rb'
+    - 'lib/haml/filters/escaped_markdown.rb'
+
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.

.ruby-version

@@ -1 +1 @@
-3.3.8
+3.2.2

CONTRIBUTORS.md

@@ -12,7 +12,6 @@ submit the change with your pull request.
 - Miles Gould / [pozorvlak](https://github.com/pozorvlak)
 - Mackenzie Morgan / [maco](https://github.com/maco)
 - Brenda Wallace / [br3nda](https://github.com/br3nda)
-- Daniel O'Connor / [CloCkWeRX](https://github.com/CloCkWeRX)
 
 ## Contributors
 
@@ -69,6 +68,7 @@ submit the change with your pull request.
 - Jym Paul Carandang / [jacarandang](https://github.com/jacarandang)
 - Anthony Atkinson / [sha1sum](https://github.com/sha1sum)
 - Terence Conquest / [twconquest](https://github.com/twconquest)
+- Daniel O'Connor / [CloCkWeRX](https://github.com/CloCkWeRX)
 - DV Dasari / [dv2](https://github.com/dv2)
 - Eric Tillberg / [Thrillberg](https://github.com/Thrillberg)
 - Lucas Nogueira / [lucasnogueira](https://github.com/lucasnogueira)
@@ -95,11 +95,10 @@ submit the change with your pull request.
 - Ítalo Pires / [italopires](https://github.com/italopires)
 - Bennett Zink / [bennett-zink](https://github.com/bennett-zink)
 - Dominick Thornton / [domthor](https://github.com/domthor)
- 
+
 ## Bots
 
 ### Security and Dependency Updates
 - `codefactor-io[bot]`
 - DeppBot / [deppbot](https://github.com/deppbot)
 - `dependabot[bot]` [dependabot](https://github.com/dependabot-bot) / [dependabot-preview](https://github.com/apps/dependabot-preview)
-- [google-labs-jules[bot]](https://github.com/apps/google-labs-jules)

Gemfile

@@ -5,13 +5,13 @@ source 'https://rubygems.org'
 # Match ruby version in .ruby-version
 ruby File.read('.ruby-version')
 
-gem 'rails', '~> 7.2.0'
+gem 'rails', '~> 7.1.0'
 
 # Keeping old sprockets
 # https://github.com/rails/sprockets-rails/issues/444#issuecomment-637817050
 gem "sprockets", "<4"
 
-gem 'bundler', '>= 2.4.22'
+gem 'bundler', '>= 2.3.10'
 
 gem 'coffee-rails'
 gem 'haml'
@@ -175,7 +175,6 @@ group :development, :test do
   gem 'rubocop-rspec_rails'
   gem 'webrat'                  # provides HTML matchers for view tests
 
-  gem 'crowdin-cli'             # for translations
   gem 'dotenv-rails'
 
   # cli utils
@@ -189,16 +188,15 @@ end
 group :test do
   gem 'axe-core-capybara'
   gem 'axe-core-rspec'
+  gem 'codeclimate-test-reporter', require: false
   gem 'rails-controller-testing'
   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 "percy-capybara", "~> 5.0.0"

Gemfile.lock

@@ -33,46 +33,51 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actioncable (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    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.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)
+    actionmailbox (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.2)
-      actionview (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       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.2.2)
-      actionpack (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actiontext (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -80,69 +85,64 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    active_median (0.6.0)
-      activesupport (>= 7.1)
+    active_median (0.4.1)
+      activesupport (>= 6.1)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
-    active_utils (3.5.0)
+    active_utils (3.4.1)
       activesupport (>= 4.2)
       i18n
-    activejob (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activejob (7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.3.6)
-    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)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
-    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)
+    activestorage (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       marcel (~> 1.0)
-    activesupport (7.2.2.2)
+    activesupport (7.1.3.4)
       base64
-      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
       minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    ast (2.4.3)
+      mutex_m
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    axe-core-api (4.10.3)
+    axe-core-api (4.9.1)
       dumb_delegator
-      ostruct
       virtus
-    axe-core-capybara (4.10.3)
-      axe-core-api (= 4.10.3)
+    axe-core-capybara (4.9.1)
+      axe-core-api (= 4.9.1)
       dumb_delegator
-    axe-core-rspec (4.10.3)
-      axe-core-api (= 4.10.3)
+    axe-core-rspec (4.9.1)
+      axe-core-api (= 4.9.1)
       dumb_delegator
-      ostruct
       virtus
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    base64 (0.3.0)
+    base64 (0.2.0)
     bcrypt (3.1.20)
-    benchmark (0.4.1)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.2.2)
+    bigdecimal (3.1.8)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (7.0.1)
       elasticsearch-model (< 8)
@@ -156,10 +156,10 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.3.0)
-    bullet (8.0.8)
+    bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    byebug (12.0.0)
+    byebug (11.1.3)
     cancancan (3.6.1)
     capybara (3.40.0)
       addressable
@@ -183,8 +183,10 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    chartkick (5.1.5)
+    chartkick (5.0.7)
     childprocess (5.0.0)
+    codeclimate-test-reporter (1.0.9)
+      simplecov (<= 0.13)
     coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -197,29 +199,20 @@ GEM
     coffee-script-source (1.12.2)
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
     crass (1.0.6)
-    crowdin-api (1.12.0)
-      open-uri (>= 0.1.0, < 0.2.0)
-      rest-client (>= 2.0.0, < 2.2.0)
-    crowdin-cli (0.2.2)
-      crowdin-api (>= 0.2.0)
-      gli (>= 2.7.0)
-      i18n (>= 0.6.4)
-      rubyzip (>= 1.0.0)
-    csv (3.3.1)
-    csv_shaper (1.4.0)
+    csv (3.3.0)
+    csv_shaper (1.3.2)
       activesupport (>= 3.0.0)
-      csv
     dalli (3.2.8)
-    database_cleaner (2.1.0)
+    database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.2.0)
+    database_cleaner-active_record (2.1.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.4.1)
+    date (3.3.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     devise (4.9.4)
@@ -228,16 +221,16 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.6.2)
-    discard (1.4.0)
-      activerecord (>= 4.2, < 9.0)
-    domain_name (0.6.20240107)
-    dotenv (3.1.8)
-    dotenv-rails (3.1.8)
-      dotenv (= 3.1.8)
+    diff-lcs (1.5.1)
+    discard (1.3.0)
+      activerecord (>= 4.2, < 8)
+    docile (1.1.5)
+    dotenv (3.1.2)
+    dotenv-rails (3.1.2)
+      dotenv (= 3.1.2)
       railties (>= 6.1)
-    drb (2.2.3)
-    dumb_delegator (1.1.0)
+    drb (2.2.1)
+    dumb_delegator (1.0.0)
     elasticsearch (7.0.0)
       elasticsearch-api (= 7.0.0)
       elasticsearch-transport (= 7.0.0)
@@ -251,25 +244,22 @@ GEM
     elasticsearch-transport (7.0.0)
       faraday
       multi_json
-    erb (5.0.2)
-    erubi (1.13.1)
+    erubi (1.13.0)
     erubis (2.7.0)
-    excon (1.2.5)
-      logger
-    execjs (2.10.0)
-    factory_bot (6.5.4)
-      activesupport (>= 6.1.0)
-    factory_bot_rails (6.5.0)
-      factory_bot (~> 6.5)
-      railties (>= 6.1.0)
-    faker (3.5.2)
+    excon (0.110.0)
+    execjs (2.9.1)
+    factory_bot (6.4.5)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.4.3)
+      factory_bot (~> 6.4)
+      railties (>= 5.0.0)
+    faker (3.4.1)
       i18n (>= 1.8.11, < 2)
-    faraday (2.13.4)
-      faraday-net_http (>= 2.0, < 3.5)
-      json
+    faraday (2.10.0)
+      faraday-net_http (>= 2.0, < 3.2)
       logger
-    faraday-net_http (3.4.1)
-      net-http (>= 0.5.0)
+    faraday-net_http (3.1.0)
+      net-http
     ffi (1.16.3)
     flickraw (0.9.10)
     font-awesome-sass (5.15.1)
@@ -277,14 +267,12 @@ GEM
     friendly_id (5.5.1)
       activerecord (>= 4.0.0)
     gbifrb (0.2.0)
-    geocoder (1.8.5)
+    geocoder (1.8.3)
       base64 (>= 0.1.0)
       csv (>= 3.0.0)
     gibbon (1.2.1)
       httparty
       multi_json (>= 1.9.0)
-    gli (2.22.2)
-      ostruct
     globalid (1.2.1)
       activesupport (>= 6.1)
     gravatar-ultimate (2.0.0)
@@ -305,32 +293,26 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.66.0)
+    haml_lint (0.58.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
     hashie (5.0.0)
-    heroics (0.1.3)
-      base64
+    heroics (0.1.2)
       erubis (~> 2.0)
       excon
       moneta
       multi_json (>= 1.9.2)
       webrick
-    highline (3.1.2)
-      reline
-    http-accept (1.7.0)
-    http-cookie (1.0.8)
-      domain_name (~> 0.5)
-    httparty (0.22.0)
-      csv
+    highline (3.0.1)
+    httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.7)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.15)
+    i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       erubi
@@ -339,30 +321,25 @@ GEM
       parser (>= 3.2.2.1)
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.8, >= 1.8.1)
       terminal-table (>= 1.5.1)
-    icalendar (2.11.2)
-      base64
+    icalendar (2.10.1)
       ice_cube (~> 0.16)
-      logger
-      ostruct
-    ice_cube (0.17.0)
+    ice_cube (0.16.4)
     ice_nine (0.11.2)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.1)
-    irb (1.15.2)
-      pp (>= 0.6.0)
+    io-console (0.7.2)
+    irb (1.13.2)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.13.2)
-    json-schema (5.1.0)
-      addressable (~> 2.8)
+    json (2.7.2)
+    json-schema (4.1.1)
+      addressable (>= 2.8)
     jsonapi-resources (0.10.7)
       activerecord (>= 4.1)
       concurrent-ruby
@@ -371,21 +348,20 @@ GEM
     kgio (2.11.4)
     kramdown (2.4.0)
       rexml
-    language_server-protocol (3.17.0.5)
-    launchy (3.0.1)
+    language_server-protocol (3.17.0.3)
+    launchy (3.0.0)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    leaflet-rails (1.9.5)
+    leaflet-rails (1.9.4)
       actionpack (>= 4.2.0)
       railties (>= 4.2.0)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
-    lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.7.0)
-    loofah (2.24.1)
+    logger (1.6.0)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -404,45 +380,39 @@ GEM
       railties (>= 3.2)
     matrix (0.4.2)
     memcachier (0.0.2)
-    method_source (1.1.0)
-    mime-types (3.7.0)
-      logger
-      mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0805)
+    method_source (1.0.0)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.9)
-    minitest (5.25.5)
+    mini_portile2 (2.8.7)
+    minitest (5.24.1)
     moneta (1.0.0)
-    msgpack (1.8.0)
+    msgpack (1.7.2)
     multi_json (1.15.0)
-    multi_xml (0.7.1)
-      bigdecimal (~> 3.1)
-    net-http (0.6.0)
+    multi_xml (0.6.0)
+    mutex_m (0.2.0)
+    net-http (0.4.1)
       uri
-    net-imap (0.5.9)
+    net-imap (0.4.11)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.1)
+    net-smtp (0.5.0)
       net-protocol
-    netrc (0.11.0)
-    nio4r (2.7.4)
-    nokogiri (1.18.9)
+    nio4r (2.7.3)
+    nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-linux-gnu)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.10)
+    oj (3.16.4)
       bigdecimal (>= 3.0)
-      ostruct (>= 0.2)
     omniauth (1.9.2)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
@@ -455,38 +425,30 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    open-uri (0.1.0)
     orm_adapter (0.5.0)
-    ostruct (0.6.2)
-    parallel (1.27.0)
-    parser (3.3.9.0)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
     percy-capybara (5.0.0)
       capybara (>= 3)
-    pg (1.6.1)
-    pg (1.6.1-x86_64-linux)
-    platform-api (3.8.0)
+    pg (1.5.6)
+    platform-api (3.7.0)
       heroics (~> 0.1.1)
       moneta (~> 1.0.0)
       rate_throttle_client (~> 0.1.0)
     popper_js (2.11.8)
-    pp (0.6.2)
-      prettyprint
-    prettyprint (0.2.0)
-    prism (1.4.0)
-    pry (0.15.2)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (5.2.6)
-      date
+    psych (5.1.2)
       stringio
-    public_suffix (6.0.1)
-    puma (6.6.1)
+    public_suffix (5.0.5)
+    puma (6.4.2)
       nio4r (~> 2.0)
-    query_diet (0.7.2)
-    racc (1.8.1)
-    rack (2.2.17)
+    query_diet (0.7.1)
+    racc (1.8.0)
+    rack (2.2.9)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -494,37 +456,37 @@ GEM
       rack (~> 2.2, >= 2.2.4)
     rack-session (1.0.2)
       rack (< 3)
-    rack-test (2.2.0)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (1.0.1)
+    rackup (1.0.0)
       rack (< 3)
       webrick
-    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)
+    rails (7.1.3.4)
+      actioncable (= 7.1.3.4)
+      actionmailbox (= 7.1.3.4)
+      actionmailer (= 7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actiontext (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.2)
+      railties (= 7.1.3.4)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.3.0)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
+    rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (7.0.10)
+      nokogiri (~> 1.14)
+    rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_12factor (0.0.3)
@@ -532,123 +494,108 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
-      irb (~> 1.13)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    raindrops (0.20.1)
-    rake (13.3.0)
+    raindrops (0.20.0)
+    rake (13.2.1)
     rate_throttle_client (0.1.2)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.14.2)
-      erb
+    rdoc (6.7.0)
       psych (>= 4.0.0)
-    recaptcha (5.20.1)
-    redis-client (0.23.2)
+    recaptcha (5.17.0)
+    redis-client (0.22.2)
       connection_pool
-    regexp_parser (2.11.2)
-    reline (0.6.2)
+    regexp_parser (2.9.2)
+    reline (0.5.9)
       io-console (~> 0.5)
     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.1)
+    rexml (3.3.1)
+      strscan
     rouge (4.1.2)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-activemodel-mocks (1.3.0)
+    rspec-activemodel-mocks (1.2.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.13.5)
+    rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (8.0.2)
-      actionpack (>= 7.2)
-      activesupport (>= 7.2)
-      railties (>= 7.2)
+    rspec-rails (6.1.3)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-rebound (0.2.1)
-      rspec-core (~> 3.3)
-    rspec-support (3.13.4)
-    rspectre (0.2.0)
-      parser (>= 3.3.7.1)
-      prism (~> 1.3)
-      rspec (~> 3.10)
-    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-support (3.13.1)
+    rspectre (0.1.0)
+      parser (>= 3.2.2.1)
+      rspec (~> 3.9)
+    rswag-api (2.13.0)
+      activesupport (>= 3.1, < 7.2)
+      railties (>= 3.1, < 7.2)
+    rswag-specs (2.13.0)
+      activesupport (>= 3.1, < 7.2)
+      json-schema (>= 2.2, < 5.0)
+      railties (>= 3.1, < 7.2)
       rspec-core (>= 2.14)
-    rswag-ui (2.16.0)
-      actionpack (>= 5.2, < 8.1)
-      railties (>= 5.2, < 8.1)
-    rubocop (1.79.2)
+    rswag-ui (2.13.0)
+      actionpack (>= 3.1, < 7.2)
+      railties (>= 3.1, < 7.2)
+    rubocop (1.65.0)
       json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.46.0, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.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.27.1)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.33.3)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.21.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
-      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
-    rubocop-rake (0.7.1)
-      lint_roller (~> 1.1)
-      rubocop (>= 1.72.1)
-    rubocop-rspec (3.6.0)
-      lint_roller (~> 1.1)
-      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)
+      rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (3.0.2)
+      rubocop (~> 1.61)
+    rubocop-rspec_rails (2.30.0)
+      rubocop (~> 1.61)
+      rubocop-rspec (~> 3, >= 3.0.1)
     ruby-progressbar (1.13.0)
-    ruby-units (4.1.0)
+    ruby-units (4.0.3)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
-    rubyzip (3.0.1)
+    rubyzip (2.3.2)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -662,25 +609,29 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (5.7.0)
+    scout_apm (5.3.8)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
-    securerandom (0.4.1)
-    selenium-webdriver (4.35.0)
+    selenium-webdriver (4.22.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 4.0)
+      rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sidekiq (7.3.9)
-      base64
+    sidekiq (7.3.0)
+      concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       logger
       rack (>= 2.2.4)
       redis-client (>= 0.22.2)
-    sprockets (3.7.5)
+    simplecov (0.13.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sprockets (3.7.3)
       base64
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -689,35 +640,32 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.1.7)
+    stringio (3.1.1)
+    strscan (3.1.0)
     sysexits (1.2.0)
-    temple (0.10.4)
-    terminal-table (4.0.0)
-      unicode-display_width (>= 1.1.1, < 4)
-    terser (1.2.5)
+    temple (0.10.3)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    terser (1.2.3)
       execjs (>= 0.3.0, < 3)
-    thor (1.4.0)
+    thor (1.3.1)
     thread_safe (0.3.6)
-    tilt (2.6.1)
+    tilt (2.3.0)
     timecop (0.9.10)
-    timeout (0.4.3)
+    timeout (0.4.1)
     trollop (1.16.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (2.5.0)
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    uniform_notifier (1.17.0)
-    uri (1.0.3)
-    useragent (0.16.11)
+    uniform_notifier (1.16.0)
+    uri (0.13.0)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    vcr (6.3.1)
-      base64
+    vcr (6.2.0)
     virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -728,10 +676,9 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    webrick (1.9.1)
-    websocket (1.2.11)
-    websocket-driver (0.8.0)
-      base64
+    webrick (1.8.1)
+    websocket (1.2.10)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (4.0.1)
@@ -741,7 +688,7 @@ GEM
       webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.3)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   ruby
@@ -760,16 +707,16 @@ DEPENDENCIES
   bootstrap-datepicker-rails
   bootstrap_form (>= 4.5.0)
   bullet
-  bundler (>= 2.4.22)
+  bundler (>= 2.3.10)
   byebug
   cancancan
   capybara
   capybara-email
   capybara-screenshot
   chartkick
+  codeclimate-test-reporter
   coffee-rails
   comfortable_mexican_sofa!
-  crowdin-cli
   csv_shaper
   dalli
   database_cleaner
@@ -819,7 +766,7 @@ DEPENDENCIES
   query_diet
   rack-cors
   rack-protection (>= 2.0.1)
-  rails (~> 7.2.0)
+  rails (~> 7.1.0)
   rails-assets-leaflet.markercluster!
   rails-controller-testing
   rails_12factor
@@ -828,7 +775,6 @@ DEPENDENCIES
   responders
   rspec-activemodel-mocks
   rspec-rails
-  rspec-rebound
   rspectre
   rswag-api
   rswag-specs
@@ -858,7 +804,7 @@ DEPENDENCIES
   xmlrpc
 
 RUBY VERSION
-   ruby 3.3.8p144
+   ruby 3.2.2p53
 
 BUNDLED WITH
    2.4.22

README.md

@@ -1,6 +1,7 @@
 # 🌱 Growstuff
 
 ![Build status](https://github.com/Growstuff/growstuff/workflows/CI/badge.svg)
+[![Code Climate](https://codeclimate.com/github/Growstuff/growstuff/badges/gpa.svg)](https://codeclimate.com/github/Growstuff/growstuff)
 
 Welcome to the Growstuff project.
 

app/assets/javascripts/likes.js

@@ -1,19 +1,11 @@
 $(document).ready(function() {
   $('.like-btn').show();
 
-  /**
-   * Handles the result of an ajax call and updates UI
-   *
-   * @param {object} data JSON data from ajax response
-   * @param {string} type object type (ie: post, activity, etc)
-   */
-  var likeableSuccess = function(data, type) {
-    var target = '.' + type + '-' + data.id;
-    var objectClass = type.charAt(0).toUpperCase() + type.slice(1);
-    var likeButton = $(target + ' .' + type + '-like');
-    var likeBadge = $(target + ' .like-badge');
+  $('.post-like').on('ajax:success', function(event, data) {
+    var likeButton = $('#post-' + data.id + ' .post-like');
+    var likeBadge = $('#post-'+ data.id + ' .like-badge');
 
-    $(target + ' .like-count').text(data.like_count);
+    $('#post-' + data.id + ' .like-count').text(data.like_count);
     if (data.liked_by_member) {
       likeBadge.addClass('liked');
       likeButton.data('method', 'delete');
@@ -22,26 +14,11 @@ $(document).ready(function() {
     } else {
       likeBadge.removeClass('liked');
       likeButton.data('method', 'post');
-      likeButton.attr('href', '/likes.json?type=' + objectClass + '&id=' + data.id);
+      likeButton.attr('href', '/likes.json?type=Post&id=' + data.id);
       likeButton.text('Like');
     }
-  };
-
-  $('.post-like').on('ajax:success', function(event, data) {
-    likeableSuccess(data, 'post');
   });
 
-  $('.activity-like').on('ajax:success', function(event, data) {
-    likeableSuccess(data, 'activity');
-  });
-
-  $('.planting-like').on('ajax:success', function(event, data) {
-    likeableSuccess(data, 'planting');
-  });
-
-  $('.harvest-like').on('ajax:success', function(event, data) {
-    likeableSuccess(data, 'harvest');
-  });
 
   $('.photo-like').on('ajax:success', function(event, data) {
     var likeBadge = $('#photo-'+ data.id + ' .like-badge');

app/assets/stylesheets/_members.scss

@@ -33,6 +33,13 @@
   }
 }
 
+.location-not-set {
+  background-image: image-url("location-not-set.en.png");
+  background-position: center;
+  background-repeat: no-repeat;
+  height: 250px;
+  width: 100%;
+}
 .card {
   .badge-location {
     background-color: darken($blue, 10%);

app/assets/stylesheets/_plantings.scss

@@ -47,13 +47,4 @@
       margin-left: auto;
     }
   }
-
-  .card-footer {
-    max-height: 2em;
-    -webkit-line-clamp: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    margin-bottom: 0.5em;
-    padding-top: 0;
-  }
 }

app/assets/stylesheets/application.scss

@@ -30,7 +30,3 @@
 @import "predictions";
 @import "homepage";
 @import "maps";
-
-@view-transition {
-  navigation: auto;
-}

app/assets/stylesheets/overrides.scss

@@ -8,9 +8,6 @@ body {
   font-family: $default-font;
 }
 
-.navbar {
-  flex-wrap: nowrap;
-}
 .navbar-brand {
   .site-name {
     font-family: "Modak", cursive;
@@ -19,7 +16,7 @@ body {
   }
 
   img {
-    height: 100%;
+    height: 60px;
   }
 }
 

app/controllers/activities_controller.rb

@@ -29,8 +29,7 @@ class ActivitiesController < DataController
 
   def new
     @activity = Activity.new(
-      owner: current_member,
-      due_date: Date.today
+      owner: current_member
     )
     if params[:garden_id]
       @activity.garden = Garden.find_by(
@@ -82,8 +81,8 @@ class ActivitiesController < DataController
   end
 
   def specifics
-    return if @owner.blank?
-
-    "#{@owner.to_param}-"
+    if @owner.present?
+      "#{@owner.to_param}-"
+    end
   end
 end

app/controllers/application_controller.rb

@@ -3,7 +3,9 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
   # Working from codespaces, we want to turn off validation
-  skip_before_action :verify_authenticity_token if Rails.env.development? && ENV['CODESPACE_NAME']
+  if Rails.env.development? && ENV['CODESPACE_NAME']
+    skip_before_action :verify_authenticity_token
+  end
 
   include ApplicationHelper
 
@@ -12,13 +14,13 @@ class ApplicationController < ActionController::Base
   rescue_from ActiveRecord::RecordNotFound, with: :not_found
 
   def store_location
-    unless request.path.in?(["/members/sign_in",
-                             "/members/sign_up",
-                             "/members/password/new",
-                             "/members/password/edit",
-                             "/members/confirmation",
-                             "/members/sign_out"]) || request.xhr?
-      store_location_for(:member, request.fullpath) if request.format == :html
+    if !(request.path.in?(["/members/sign_in",
+                           "/members/sign_up",
+                           "/members/password/new",
+                           "/members/password/edit",
+                           "/members/confirmation",
+                           "/members/sign_out"]) || request.xhr?) && (request.format == :html)
+      store_location_for(:member, request.fullpath)
     end
   end
 
@@ -78,7 +80,6 @@ class ApplicationController < ActionController::Base
                     :tos_agreement,
                     # profile stuff
                     :bio, :location, :latitude, :longitude,
-                    :website_url, :instagram_handle, :facebook_handle, :bluesky_handle, :other_url,
                     # email settings
                     :show_email, :newsletter, :send_notification_email, :send_planting_reminder,
                     # update password

app/controllers/crops_controller.rb

@@ -113,12 +113,7 @@ class CropsController < ApplicationController
       @crop.approval_status = "pending"
     end
 
-    if Crop.transaction { @crop.save && save_crop_names }
-      notify_wranglers
-    else
-      @crop.alternate_names.build
-      @crop.scientific_names.build
-    end
+    notify_wranglers if Crop.transaction { @crop.save && save_crop_names }
 
     respond_with @crop
   end

app/controllers/garden_collaborators_controller.rb

@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-class GardenCollaboratorsController < ApplicationController
-  before_action :authenticate_member!, except: %i(index show)
-  before_action :load_garden
-  load_and_authorize_resource id_param: :slug
-
-  respond_to :html
-  responders :flash
-
-  def index
-    @garden_collaborators = @garden.garden_collaborators.paginate(page: params[:page])
-    respond_with(@garden_collaborators)
-  end
-
-  def show
-    @garden_collaborator = GardenCollaborator.find(params[:garden_collaborator_id])
-
-    respond_with(@garden_collaborator)
-  end
-
-  def new
-    @garden_collaborator = GardenCollaborator.new(garden: @garden)
-
-    authorize! :create, @garden_collaborator
-
-    respond_with(@garden_collaborator)
-  end
-
-  def edit
-    @garden_collaborator = GardenCollaborator.find(params[:id])
-
-    authorize! :update, @garden_collaborator
-
-    respond_with(@garden_collaborator)
-  end
-
-  def create
-    @garden_collaborator = GardenCollaborator.new(garden: @garden)
-    authorize! :create, @garden_collaborator
-
-    @member = Member.find_by(slug: params[:garden_collaborator][:member_slug])
-
-    @garden_collaborator.member = @member
-    if @garden_collaborator.save
-      redirect_to garden_garden_collaborators_path(@garden)
-    else
-      respond_with(@garden_collaborator)
-    end
-  end
-
-  def update
-    @garden_collaborator = GardenCollaborator.find(params[:id])
-    authorize! :update, @garden_collaborator
-
-    @member = Member.find_by(slug: params[:garden_collaborator][:member_slug])
-
-    @garden_collaborator.member = @member
-    @garden_collaborator.save
-
-    respond_with(@garden_collaborator)
-  end
-
-  def destroy
-    @garden_collaborator = GardenCollaborator.find(params[:id])
-
-    authorize! :destroy, @garden_collaborator
-
-    if @garden_collaborator.destroy
-      redirect_to garden_garden_collaborators_path(@garden)
-    else
-      respond_with(@garden_collaborator)
-    end
-  end
-
-  private
-
-  def load_garden
-    @garden = Garden.find_by(slug: params[:garden_slug])
-  end
-
-  def garden_collaborator_params
-    params.require(:garden_collaborator).permit(
-      :member_slug
-    )
-  end
-end

app/controllers/gardens_controller.rb

@@ -8,10 +8,7 @@ class GardensController < DataController
 
     @gardens = @gardens.includes(:owner)
     @gardens = @gardens.active unless @show_all
-    if @owner.present?
-      @gardens = @gardens.left_joins(:garden_collaborators)
-      @gardens = @gardens.where(owner: @owner).or(@gardens.where(garden_collaborators: { member: @owner }))
-    end
+    @gardens = @gardens.where(owner: @owner) if @owner.present?
     @gardens = @gardens.where.not(members: { confirmed_at: nil })
       .order(:name).paginate(page: params[:page])
     respond_with(@gardens)

app/controllers/members_controller.rb

@@ -61,7 +61,7 @@ class MembersController < ApplicationController
   end
 
   def unsubscribe
-    verifier = ActiveSupport::MessageVerifier.new(ENV.fetch('RAILS_SECRET_TOKEN', nil))
+    verifier = ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
     decrypted_message = verifier.verify(params[:message])
 
     @member = Member.find(decrypted_message[:member_id])

app/controllers/messages_controller.rb

@@ -8,11 +8,9 @@ class MessagesController < ApplicationController
   end
 
   def show
-    if (@message = Message.find_by(id: params[:id])) && (@conversation = @message.conversation)
-      if @conversation.is_participant?(current_member)
-        redirect_to conversation_path(@conversation, box: @box, anchor: "message_" + @message.id.to_s)
-        return
-      end
+    if (@message = Message.find_by(id: params[:id])) && (@conversation = @message.conversation) && @conversation.is_participant?(current_member)
+      redirect_to conversation_path(@conversation, box: @box, anchor: "message_" + @message.id.to_s)
+      return
     end
     redirect_to conversations_path(box: @box)
   end
@@ -21,7 +19,7 @@ class MessagesController < ApplicationController
     return if params[:recipient_id].blank?
 
     @recipient = Member.find_by(id: params[:recipient_id])
-    nil if @recipient.nil?
+    return if @recipient.nil?
   end
 
   def create

app/controllers/omniauth_callbacks_controller.rb

@@ -41,7 +41,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
   def after_sign_in_path_for(resource)
     if resource.tos_agreement
-      super
+      super(resource)
     else
       finish_signup_path(resource)
     end

app/controllers/seeds_controller.rb

@@ -19,10 +19,6 @@ class SeedsController < DataController
       where['parent_planting'] = @planting.id
     end
 
-    if params[:tradeable_to].present?
-      where['tradeable_to'] = params[:tradeable_to]
-    end
-
     @show_all = (params[:all] == '1')
     where['finished'] = false unless @show_all
 

app/helpers/application_helper.rb

@@ -28,6 +28,12 @@ module ApplicationHelper
     "#{klass.name.downcase.pluralize}/#{identifier}-#{count}-#{max_updated_at}"
   end
 
+  def required_field_help_text
+    asterisk = tag.span('*', class: ['red'])
+    text = tag.em('denotes a required field')
+    tag.div(asterisk + ' '.html_safe + text, class: ['margin-bottom'])
+  end
+
   # A helper to replace the complex template compilation mess
   # of HAML, Tilt, and dynamic compilation with interpolated ruby.
   def markdownify(text)

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]}" #{options[:required] ? 'required="required"' : ''}
+      <input id="#{source}" class="auto-suggest #{options[:class]}"
         type="text" value="#{default}" data-source-url="#{source_path}",
         placeholder="e.g. lettuce">
       <noscript class="text-warning">

app/helpers/crops_helper.rb

@@ -7,14 +7,14 @@ module CropsHelper
 
     return "You don't have any seeds of this crop." if seeds.none?
 
-    if total_quantity == 0
-      "You have an unknown quantity of seeds of this crop."
-    else
+    if total_quantity != 0
       "You have #{total_quantity} #{Seed.model_name.human(count: total_quantity)} of this crop."
+    else
+      "You have an unknown quantity of seeds of this crop."
     end
   end
 
   def crop_ebay_seeds_url(crop)
-    "https://www.ebay.com/sch/i.html?_nkw=#{CGI.escape crop.name}"
+    "https://rover.ebay.com/rover/1/705-53470-19255-0/1?icep_ff3=9&pub=5575213277&toolid=10001&campid=5337940151&customid=&icep_uq=#{CGI.escape crop.name}&icep_sellerId=&icep_ex_kw=&icep_sortBy=12&icep_catId=181003&icep_minPrice=&icep_maxPrice=&ipn=psmain&icep_vectorid=229515&kwid=902099&mtid=824&kw=lg"
   end
 end

app/mailers/notifier_mailer.rb

@@ -2,15 +2,15 @@
 
 class NotifierMailer < ApplicationMailer
   # include NotificationsHelper
-  default from: "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"
+  default from: "Growstuff <#{ENV['GROWSTUFF_EMAIL']}>"
 
   def verifier
     unless ENV['RAILS_SECRET_TOKEN']
-      raise "RAILS_SECRET_TOKEN environment variable" \
-            "not set - have you created config/application.yml?"
+      raise "RAILS_SECRET_TOKEN environment variable"\
+        "not set - have you created config/application.yml?"
     end
 
-    ActiveSupport::MessageVerifier.new(ENV.fetch('RAILS_SECRET_TOKEN', nil))
+    ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
   end
 
   def notify(notification)
@@ -27,7 +27,7 @@ class NotifierMailer < ApplicationMailer
 
   def planting_reminder(member)
     @member = member
-    @sitename = ENV.fetch('GROWSTUFF_SITE_NAME', nil)
+    @sitename = ENV['GROWSTUFF_SITE_NAME']
 
     @late = []
     @super_late = []

app/models/ability.rb

@@ -108,38 +108,16 @@ class Ability
     can :create,  Planting
     can :update,  Planting, garden: { owner_id: member.id }, crop: { approval_status: 'approved' }
     can :destroy, Planting, garden: { owner_id: member.id }, crop: { approval_status: 'approved' }
-    can :update, Planting do |planting|
-      planting.garden.garden_collaborators.where(member_id: member.id).any?
-    end
-    can :destroy, Planting do |planting|
-      planting.garden.garden_collaborators.where(member_id: member.id).any?
-    end
-
-    can :create,  GardenCollaborator, garden: { owner_id: member.id }
-    can :update,  GardenCollaborator, garden: { owner_id: member.id }
-    can :destroy, GardenCollaborator, garden: { owner_id: member.id }
 
     can :create,  Activity
     can :update,  Activity, owner_id: member.id
     can :destroy, Activity, owner_id: member.id
-    can :update, Activity do |activity|
-      activity.garden&.garden_collaborators&.where(member_id: member.id)&.any?
-    end
-    can :destroy, Activity do |activity|
-      activity.garden&.garden_collaborators&.where(member_id: member.id)&.any?
-    end
 
     can :create,  Harvest
     can :update,  Harvest, owner_id: member.id
     can :destroy, Harvest, owner_id: member.id
     can :update,  Harvest, owner_id: member.id, planting: { owner_id: member.id }
     can :destroy, Harvest, owner_id: member.id, planting: { owner_id: member.id }
-    can :update, Harvest do |harvest|
-      harvest.planting&.garden&.garden_collaborators&.where(member_id: member.id)&.any?
-    end
-    can :destroy, Harvest do |harvest|
-      harvest.planting&.garden&.garden_collaborators&.where(member_id: member.id)&.any?
-    end
 
     can :create, Photo
     can :update, Photo, owner_id: member.id

app/models/activity.rb

@@ -5,7 +5,6 @@ class Activity < ApplicationRecord
   include Ownable
   include Finishable
   include SearchActivities
-  include Likeable
 
   belongs_to :garden, optional: true
   belongs_to :planting, optional: true

app/models/concerns/member_flickr.rb

@@ -9,8 +9,8 @@ module MemberFlickr
       if @flickr.nil?
         flickr_auth = auth('flickr')
         if flickr_auth
-          FlickRaw.api_key = ENV.fetch('GROWSTUFF_FLICKR_KEY', nil)
-          FlickRaw.shared_secret = ENV.fetch('GROWSTUFF_FLICKR_SECRET', nil)
+          FlickRaw.api_key = ENV['GROWSTUFF_FLICKR_KEY']
+          FlickRaw.shared_secret = ENV['GROWSTUFF_FLICKR_SECRET']
           @flickr = FlickRaw::Flickr.new
           @flickr.access_token = flickr_auth.token
           @flickr.access_secret = flickr_auth.secret

app/models/concerns/search_activities.rb

@@ -44,7 +44,7 @@ module SearchActivities
       1..limit.times do
         where = {
           # photos_count: { gt: 0 },
-          owner_id: { not: owners }
+          owner_id:     { not: owners }
         }
         one_record = search('*',
                             limit:    1,

app/models/concerns/search_plantings.rb

@@ -30,8 +30,7 @@ module SearchPlantings
         quantity:,
         sunniness:,
         garden_id:,
-        garden_slug:                garden&.garden_slug,
-        garden_name:                garden&.name,
+        garden_name: garden&.name,
         description:,
 
         first_harvest_predicted_at:,

app/models/csv_importer.rb

@@ -59,7 +59,7 @@ class CsvImporter
 
     alternate_names.split(/,\s*/).each do |name|
       altname = AlternateName.find_by(name:, crop: @crop)
-      altname ||= AlternateName.create! name:, crop: @crop, creator: cropbot
+      altname ||= AlternateName.create! name: name, crop: @crop, creator: cropbot
       @crop.alternate_names << altname
     end
   end

app/models/follow.rb

@@ -10,7 +10,7 @@ class Follow < ApplicationRecord
       recipient_id: followed_id,
       sender_id:    follower_id,
       subject:      "#{follower.login_name} is now following you",
-      body:         "#{follower.login_name} just followed you on #{ENV.fetch('GROWSTUFF_SITE_NAME', nil)}. "
+      body:         "#{follower.login_name} just followed you on #{ENV['GROWSTUFF_SITE_NAME']}. "
     )
   end
 end

app/models/garden.rb

@@ -10,7 +10,6 @@ class Garden < ApplicationRecord
   has_many :plantings, dependent: :destroy
   has_many :crops, through: :plantings
   has_many :activities, dependent: :destroy
-  has_many :garden_collaborators, dependent: :destroy
 
   belongs_to :garden_type, optional: true
 

app/models/garden_collaborator.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class GardenCollaborator < ApplicationRecord
-  belongs_to :member
-  belongs_to :garden
-
-  validates :member_id, uniqueness: { scope: :garden }
-  validate :not_garden_owner
-
-  def not_garden_owner
-    return unless member
-    return unless garden
-
-    errors.add(:member_id, "cannot be the garden owner") if garden.owner == member
-  end
-
-  def member_slug
-    @member&.slug
-  end
-
-  def member_slug=(_slug)
-    member_slug
-  end
-end

app/models/harvest.rb

@@ -6,7 +6,6 @@ class Harvest < ApplicationRecord
   include PhotoCapable
   include Ownable
   include SearchHarvests
-  include Likeable
 
   friendly_id :harvest_slug, use: %i(slugged finders)
 
@@ -153,10 +152,7 @@ class Harvest < ApplicationRecord
   def owner_must_match_planting
     return if planting.blank? # only check if we are linked to a planting
 
-    return if owner == planting.owner || planting.garden.garden_collaborators.where(member_id: owner).any?
-
-    errors.add(:owner,
-               "of harvest must be the same as planting, or a collaborator on that garden")
+    errors.add(:owner, "of harvest must be the same as planting") unless owner == planting.owner
   end
 
   def harvest_must_be_after_planting

app/models/member.rb

@@ -91,9 +91,6 @@ class Member < ApplicationRecord
             uniqueness: {
               case_sensitive: false
             }
-  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/planting.rb

@@ -8,7 +8,6 @@ class Planting < ApplicationRecord
   include PredictPlanting
   include PredictHarvest
   include SearchPlantings
-  include Likeable
 
   friendly_id :planting_slug, use: %i(slugged finders)
 
@@ -61,7 +60,6 @@ class Planting < ApplicationRecord
            to: :crop, prefix: true
   delegate :login_name, :slug, :location, to: :owner, prefix: true
   delegate :slug, to: :planting, prefix: true
-  delegate :slug, :name, to: :garden, prefix: true
 
   delegate :annual?, :perennial?, :svg_icon, to: :crop
   delegate :location, :longitude, :latitude, to: :garden
@@ -128,9 +126,6 @@ class Planting < ApplicationRecord
   end
 
   def owner_must_match_garden_owner
-    return if owner == garden.owner || garden.garden_collaborators.where(member_id: owner).any?
-
-    errors.add(:owner,
-               "must be the same as garden, or a collaborator on that garden")
+    errors.add(:owner, "must be the same as garden") unless owner == garden.owner
   end
 end

app/models/seed.rb

@@ -33,17 +33,17 @@ class Seed < ApplicationRecord
   validates :days_until_maturity_max, allow_nil:    true,
                                       numericality: { only_integer: true, greater_than_or_equal_to: 0 }
   validates :tradable_to, allow_blank: false,
-                          inclusion:   { in: TRADABLE_TO_VALUES, message: "You may only trade seed nowhere, " \
-                                                                          "locally, nationally, or internationally" }
+                          inclusion:   { in: TRADABLE_TO_VALUES, message: "You may only trade seed nowhere, "\
+                                                "locally, nationally, or internationally" }
   validates :organic, allow_blank: false,
-                      inclusion:   { in: ORGANIC_VALUES, message: "You must say whether the seeds " \
-                                                                  "are organic or not, or that you don't know" }
+                      inclusion:   { in: ORGANIC_VALUES, message: "You must say whether the seeds "\
+                                             "are organic or not, or that you don't know" }
   validates :gmo, allow_blank: false,
-                  inclusion:   { in: GMO_VALUES, message: "You must say whether the seeds are " \
-                                                          "genetically modified or not, or that you don't know" }
+                  inclusion:   { in: GMO_VALUES, message: "You must say whether the seeds are "\
+                                                        "genetically modified or not, or that you don't know" }
   validates :heirloom, allow_blank: false,
-                       inclusion:   { in: HEIRLOOM_VALUES, message: "You must say whether the seeds" \
-                                                                    "are heirloom, hybrid, or unknown" }
+                       inclusion:   { in: HEIRLOOM_VALUES, message: "You must say whether the seeds"\
+                                                                  "are heirloom, hybrid, or unknown" }
 
   #
   # Delegations
@@ -56,7 +56,7 @@ class Seed < ApplicationRecord
   default_scope { joins(:owner).merge(Member.kept) } # Ensure owner exists
   scope :tradable, -> { where.not(tradable_to: 'nowhere') }
   scope :interesting, -> { tradable.has_location }
-  scope :has_location, -> { joins(:owner).where.not('members.location': nil) }
+  scope :has_location, -> { joins(:owner).where.not("members.location": nil) }
   scope :recent, -> { order(created_at: :desc) }
   scope :active, -> { where('finished <> true').where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
 

app/views/activities/_actions.haml

@@ -1,5 +1,5 @@
 - if can?(:edit, activity)
-  %span.dropdown.activity-actions
+  .dropdown.activity-actions
     %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')

app/views/activities/_form.html.haml

@@ -6,6 +6,7 @@
         %strong=yield :title
   = bootstrap_form_for(@activity) do |f|
     .card-body
+      = required_field_help_text
       - if @activity.errors.any?
         #error_explanation
           %h2
@@ -39,9 +40,9 @@
           = link_to "Add a planting.", new_planting_path
 
         .col-md-4
-          = f.date_field :due_date,
+          = f.text_field :due_date,
                      value: @activity.due_date ? @activity.due_date.to_fs(:ymd) : '',
-                     label: 'When?'
+                     class: 'add-datepicker', label: 'When?'
 
       %hr
 

app/views/activities/show.html.haml

@@ -22,17 +22,19 @@
             %small.text-muted= @activity.category
           %tt
             = @activity.due_date
-        - if @activity.description.present?
-          :markdown
-            #{strip_tags markdownify(@activity.description)}
-      = render 'likes/likes', object: @activity
-      = render 'activities/actions', activity: @activity
 
     .col-md-4.col-xs-12
       = render 'activities/owner', planting: @activity
 
     .col-md-8.col-xs-12
-
+      - if @activity.description.present?
+        = cute_icon
+        .card
+          .card-header
+            %h2 Description
+          .card-body
+            :markdown
+              #{strip_tags markdownify(@activity.description)}
 
       - if @activity.garden
         %section.gardens
@@ -46,3 +48,4 @@
 
 
     .col-md-4.col-xs-12
+      = render 'activities/actions', activity: @activity

app/views/crops/_form.html.haml

@@ -26,7 +26,7 @@
       %h2 Basic information
 
       .form-group#new_crop
-      = f.text_field :name, required: true
+      = f.text_field :name
       %span.help-block
         The common name for the crop, in English (required).
         - if can? :wrangle, @crop
@@ -43,7 +43,7 @@
 
       - unless @crop.approved?
         = link_to 'Search wikipedia', "https://en.wikipedia.org/w/index.php?search=#{@crop.name}", target: '_blank'
-      = f.url_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
+      = f.text_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).
 

app/views/devise/registrations/_edit_profile.html.haml

@@ -13,32 +13,7 @@
   .form-group
     = f.label :bio, class: 'control-label col-md-2'
     .col-md-8
-      = f.text_area :bio, rows: 6, class: 'form-control', placeholder: "I'm am XYZ gardener interested in A, B, C"
-
-  .form-group
-    = f.label :website_url, 'Website', class: 'control-label col-md-2'
-    .col-md-8
-      = f.url_field :website_url, class: 'form-control', placeholder: "https://you.example.com/"
-
-  .form-group
-    = f.label :instagram_handle, 'Instagram', class: 'control-label col-md-2'
-    .col-md-8
-      = f.text_field :instagram_handle, class: 'form-control', placeholder: 'your_handle'
-
-  .form-group
-    = f.label :facebook_handle, 'Facebook', class: 'control-label col-md-2'
-    .col-md-8
-      = f.text_field :facebook_handle, class: 'form-control', placeholder: 'your_handle'
-
-  .form-group
-    = f.label :bluesky_handle, 'Bluesky', class: 'control-label col-md-2'
-    .col-md-8
-      = f.text_field :bluesky_handle, class: 'form-control', placeholder: 'your_handle'
-
-  .form-group
-    = f.label :other_url, 'Other URL', class: 'control-label col-md-2'
-    .col-md-8
-      = f.url_field :other_url, class: 'form-control', placeholder: "https://you.example.com/"
+      = f.text_area :bio, rows: 6, class: 'form-control'
 
   .form-group
     %label.control-label.col-md-2

app/views/garden_collaborators/_form.html.haml

@@ -1,18 +0,0 @@
-.card.col-md-8.col-lg-7.mx-auto.float-none.white.z-depth-1.py-2.px-2
-  = bootstrap_form_for(@garden_collaborator.new_record? ? [@garden, @garden_collaborator] : garden_garden_collaborator_path(@garden, @garden_collaborator)) do |f|
-    .card-body
-      - if @garden_collaborator.errors.any?
-        #error_explanation.alert.alert-warning{:role => "alert"}
-          %h4.alert-heading
-            = pluralize(@garden_collaborator.errors.size, "error")
-            prohibited this garden collaborator from being saved
-          %ul
-            - @garden_collaborator.errors.full_messages.each do |msg|
-              %li= msg
-
-      .alert.alert-info
-        Ask your friend, family member or community garden member for their growstuff username to add them as a collaborator on your garden.
-      = f.text_field :member_slug, maxlength: 255, required: true
-      .row
-    .card-footer
-      .text-right= f.submit 'Save Collaboator'

app/views/garden_collaborators/edit.html.haml

@@ -1,3 +0,0 @@
-- content_for :title, "Edit garden collaborator"
-
-= render 'form'

app/views/garden_collaborators/index.html.haml

@@ -1,72 +0,0 @@
-- content_for :title, "#{@garden} collaborators"
-
-%h1=  "#{@garden} collaborators"
-
-- content_for :breadcrumbs do
-  %li.breadcrumb-item= link_to 'Gardens', gardens_path
-  %li.breadcrumb-item.active= link_to @garden, gardens_path(@garden)
-
-.row
-  .col-md-2
-    - if current_member.present?
-      .flex-column.nav-pills.layout-nav{"role" => "tablist", "aria-orientation"=>"vertical"}
-        - if can?(:create, GardenCollaborator.new(garden: @garden))
-          = link_to url_for([@garden, GardenCollaborator.new(garden: @garden), action: :new]), class: 'btn' do
-            Add a #{GardenCollaborator.new(garden: @garden).model_name.human}
-    - else
-      = render 'shared/signin_signup', to: "record your #{model.to_s.pluralize.downcase}"
-
-    %hr/
-    %p.text-center
-      #{ENV['GROWSTUFF_SITE_NAME']} helps you track what you're
-      harvesting from your home garden and see how productive it is.
-
-
-  .col-md-10
-    - if @garden_collaborators.empty?
-      %p There are no collaborators to display.
-      - if can?(:create, GardenCollaborator) && @owner == current_member
-        = link_to 'Add a garden collaborator', new_garden_garden_collaborator_path, class: 'btn btn-primary'
-
-    - else
-      %section
-        %h2= page_entries_info @garden_collaborators
-        = will_paginate @garden_collaborators
-
-        - @garden_collaborators.each do |garden_collaborator|
-          - member = garden_collaborator.member
-          - cache member do
-            .card
-              .card-body
-                - if can?(:destroy, garden_collaborator)
-                  %div{"style": "float: right"}
-                    = link_to garden_garden_collaborator_path(@garden, garden_collaborator), method: :delete, class: "btn btn-danger" do
-                      Remove access
-
-                %h4.login-name= link_to member, member
-                %div
-                  = render "members/avatar", member: member
-                %div
-                  = link_to "view all #{member}'s gardens", member_gardens_path(member)
-                  %p
-                    %small
-                      Joined
-                      = distance_of_time_in_words(member.created_at, Time.zone.now)
-                      ago.
-                  - if member.location.present?
-                    = link_to member.location, place_path(member.location)
-              .card-footer
-                %ul.nav.nav-justified.small
-                  %li.nav-item.border-right
-                    = link_to member_plantings_path(member) do
-                      = localize_plural(member.plantings.active, Planting)
-                  %li.nav-item.border-right
-                    = link_to member_harvests_path(member) do
-                      = localize_plural(member.harvests, Harvest)
-                  %li.nav-item
-                    = link_to member_seeds_path(member) do
-                      = localize_plural(member.seeds.active, Seed)
-
-      .row
-        .col-12= page_entries_info @garden_collaborators
-        .col-12= will_paginate @garden_collaborators

app/views/garden_collaborators/new.html.haml

@@ -1,3 +0,0 @@
-- content_for :title, "New garden collaborator"
-
-= render 'form'

app/views/gardens/_form.html.haml

@@ -5,6 +5,7 @@
         %h1.h2-responsive.text-center
           %strong=yield :title
     .card-body
+      = required_field_help_text
       - if @garden.errors.any?
         #error_explanation.alert.alert-warning{:role => "alert"}
           %h4.alert-heading
@@ -15,7 +16,7 @@
               %li= msg
 
       = f.text_field :name, maxlength: 255, required: true
-      = f.text_area :description, rows: 6, placeholder: "Tell us about this garden - where is it located? What does it look like? Do you have a link to a photo? Do you have irrigation? What are your plans?"
+      = f.text_area :description, rows: 6
       = f.text_field :location,
                       value: @garden.location || current_member.location,
                       class: 'form-control', maxlength: 255
@@ -26,7 +27,7 @@
         - else
           = link_to "Change your location.", edit_member_registration_path
       .row
-        .col-md-5.col-12= f.number_field :area, class: 'input-small', step: "any", min: 0
+        .col-md-5.col-12= f.number_field :area, class: 'input-small', step: "any"
         .col-md-7.col-12= f.select(:area_unit, Garden::AREA_UNITS_VALUES, { include_blank: false })
         .col-12= f.select(:garden_type_id, GardenType.all.order(:name).pluck(:name, :id),
                           selected: @garden.garden_type_id, include_blank: true)

app/views/gardens/show.html.haml

@@ -31,7 +31,7 @@
       %p
         :markdown
           #{strip_tags markdownify(@garden.description)}
-        - unless @garden.description.present?
+        - unless @garden.description
           .row-fluid
             %p No description available yet.
 
@@ -39,13 +39,8 @@
               %p
                 Why not
                 = link_to 'tell us more.', edit_garden_path(@garden)
-        - else
-          - if can? :edit, @garden
-            %p
-              Did you want to
-              = link_to 'update this description.', edit_garden_path(@garden)
 
-    - if @garden.plantings.active.any?
+    - if @garden.plantings.where.not(planted_at: nil).any?
       %section.card
         %h2 Garden progress
         .card-body
@@ -60,14 +55,6 @@
         - else
           .col-md-12
             %p Nothing is currently planted here.
-        - if can?(:edit, @garden)
-          .col-md-12
-            = garden_plant_something_button(@garden)
-  
-      - if can?(:destroy, @garden)
-        .dropdown-divider
-        = delete_button(@garden, classes: 'dropdown-item text-danger',
-          message: 'All plantings associated with this garden will also be deleted. Are you sure?')
 
     %section
       %h2 Current activities in garden
@@ -78,9 +65,6 @@
         - else
           .col-md-12
             %p Nothing is currently planned here.
-        - if can?(:edit, @garden)
-          .col-md-12
-            = garden_plan_something_button(@garden)
 
     - if @suggested_companions.any?
       %section.companions
@@ -99,17 +83,6 @@
         %p
           %strong Owner:
           = link_to @garden.owner, @garden.owner
-        %p
-          %strong Collaborators:
-          - if can?(:create, GardenCollaborator.new(garden: @garden))
-            = link_to "Manage", garden_garden_collaborators_path(@garden)
-          - if @garden.garden_collaborators.any?
-            %ul
-              - @garden.garden_collaborators.each do |collabator|
-                %li= link_to collabator.member, collabator.member
-          - else
-            None
-
         - if @garden.location.present?
           %p
             %strong Location:

app/views/harvests/_actions.html.haml

@@ -1,5 +1,5 @@
 - if can?(:edit, harvest)
-  %span.dropdown.harvest-actions
+  .dropdown.harvest-actions
     %a#harvest-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" => "harvest-actions-button"}
       = harvest_edit_button(harvest, classes: 'dropdown-item')

app/views/harvests/_form.html.haml

@@ -7,6 +7,7 @@
           = harvest_icon
           %strong=yield :title
     .card-body
+      = required_field_help_text
       - if @harvest.errors.any?
         #error_explanation
           %h2 #{pluralize(@harvest.errors.size, "error")} prohibited this harvest from being saved:"
@@ -30,7 +31,8 @@
                 = link_to "Request new crops.", new_crop_path
 
         .col-md-4
-          = f.date_field :harvested_at, value: @harvest.harvested_at ? @harvest.harvested_at.to_fs(:ymd) : '', label: 'When?'
+          = f.text_field :harvested_at, value: @harvest.harvested_at ? @harvest.harvested_at.to_fs(:ymd) : '',
+                         class: 'add-datepicker', label: 'When?'
         .col-12
           = f.form_group :plant_part_id, label: { text: "Harvested Plant Part" } do
             .row
@@ -42,7 +44,7 @@
       -# http://blog.isotoma.com/2012/03/html5-input-typenumber-and-decimalsfloats-in-chrome/
       .row
         .col-md-4
-          = f.number_field :quantity, class: 'input-small form-control', step: 'any', label: 'How many?', min: 1
+          = f.number_field :quantity, class: 'input-small form-control', step: 'any', label: 'How many?'
         .col-md-8
           = f.select(:unit, Harvest::UNITS_VALUES, { include_blank: false }, class: 'input-medium form-control')
       .row

app/views/harvests/show.html.haml

@@ -15,26 +15,13 @@
 .harvest
   .row
     .col-md-8.col-xs-12
-      .jumbotron
-        .d-flex.justify-content-between
-          %h1.display-3
-            = harvest_icon
-            %strong= @harvest.crop
-            %small.text-muted
-              harvested by
-              = @harvest.owner
-
-        - if @harvest.description.present?
-          :markdown
-            #{strip_tags markdownify(@harvest.description)}
-
-      = render partial: 'planting'
-      = render 'likes/likes', object: @harvest
-      = render 'harvests/actions', harvest: @harvest
-
+      %h1
+        = harvest_icon
+        #{@harvest.crop} harvested by #{@harvest.owner}
     .col-md-4.col-xs-12
-      = render 'harvests/owner', harvest: @harvest
+      = render 'harvests/actions', harvest: @harvest
     .col-md-8.col-xs-12
+      = render partial: 'planting'
       .index-cards.facts
         - if @harvest.plant_part
           .card
@@ -66,5 +53,14 @@
           Havested from
           = link_to @harvest.planting, @harvest.planting
 
+      - if @harvest.description.present?
+        .card
+          .card-header
+            %h2 Notes
+          .card-body
+            :markdown
+              #{strip_tags markdownify(@harvest.description)}
+
     .col-md-4.col-xs-12
+      = render 'harvests/owner', harvest: @harvest
       = render @harvest.crop

app/views/home/index.html.haml

@@ -51,8 +51,7 @@
     %section.seeds
       = cute_icon
       = render 'seeds'
-      %p.text-right
-        = link_to "#{t('home.seeds.view_all')} »", seeds_path(tradeable_to: ['locally', 'nationally', 'internationally']), class: 'btn btn-block'
+      %p.text-right= link_to "#{t('home.seeds.view_all')} »", seeds_path, class: 'btn btn-block'
   .col-12.col-lg-6
     %section.discussion.text-center
       = cute_icon

app/views/likes/_count.haml

@@ -1,4 +1,4 @@
 %span.badge.like-badge{class: liked ? 'liked' : ''}
   = like_icon
    
-  %span.like-count{title: t('buttons.total_likes')}= likeable.likes_count
+  %span.like-count= likeable.likes_count

app/views/likes/_likes.html.haml

@@ -1,18 +0,0 @@
-%span.likes
-  - if member_signed_in? && can?(:new, Like)
-    - if !object.liked_by?(current_member)
-      = link_to likes_path(type: object.class.name, id: object.id, format: :json),
-                title: t('buttons.like'),
-                method: :post,
-                remote: true,
-                class: "#{object.class.name.downcase}-#{object.id} #{object.class.name.downcase}-like like-btn btn" do
-        = render 'likes/count', likeable: object, liked: false
-    - else
-      = link_to likes_path(type: object.class.name, id: object.id, format: :json),
-                title: t('buttons.unlike'),
-                method: :delete,
-                remote: true,
-                class: "#{object.class.name.downcase}-#{object.id} #{object.class.name.downcase}-like like-btn btn" do
-        = render 'likes/count', likeable: object, liked: true
-  - else
-    = render 'likes/count', likeable: object, liked: member_signed_in? && object.liked_by?(current_member)

app/views/members/_bio.html.haml

@@ -1 +1,13 @@
 %h2 All about #{member.login_name}
+%p
+  %small
+    %a{href: "#content"}
+      Skip to main content
+- if member.bio.blank?
+  - if can? :edit, member
+    = link_to "Add a bio to complete your profile.", edit_member_registration_path
+  - else
+    #{member.login_name} hasn't written a bio yet.
+- else
+  :markdown
+    #{ strip_tags markdownify(member.bio) }

app/views/members/_contact.html.haml

@@ -1,42 +1,17 @@
-- if member.website_url.present? || member.instagram_handle.present? || member.facebook_handle.present? || member.bluesky_handle.present? || member.other_url.present? || twitter_auth || flickr_auth || member.show_email
+- if twitter_auth || flickr_auth || member.show_email
   %h4 Contact
 
-  - if member.website_url.present?
-    %p
-      = icon 'fas', 'globe', class: 'fa-fw'
-      = link_to "Website", member.website_url, target: '_blank', rel: 'noopener noreferrer'
-
-  - if member.instagram_handle.present?
-    %p
-      = icon 'fab', 'instagram', class: 'fa-fw'
-      = link_to member.instagram_handle, "https://instagram.com/#{member.instagram_handle}", target: '_blank', rel: 'noopener noreferrer'
-
-  - if member.facebook_handle.present?
-    %p
-      = icon 'fab', 'facebook', class: 'fa-fw'
-      = link_to member.facebook_handle, "https://facebook.com/#{member.facebook_handle}", target: '_blank', rel: 'noopener noreferrer'
-
-  - if member.bluesky_handle.present?
-    %p
-      = icon 'fas', 'comment-dots', class: 'fa-fw'
-      = link_to member.bluesky_handle, "https://bsky.app/profile/#{member.bluesky_handle}", target: '_blank', rel: 'noopener noreferrer'
-
-  - if member.other_url.present?
-    %p
-      = icon 'fas', 'link', class: 'fa-fw'
-      = link_to "More...", member.other_url, target: '_blank', rel: 'noopener noreferrer'
-
   - if twitter_auth
     %p
       = image_tag "twitter_32.png", size: "32x32", alt: 'Twitter logo'
-      = link_to twitter_auth.name, "https://twitter.com/#{twitter_auth.name}", target: '_blank', rel: 'noopener noreferrer'
+      = link_to twitter_auth.name, "https://twitter.com/#{twitter_auth.name}"
 
   - if flickr_auth
     %p
       = image_tag "flickr_32.png", size: "32x32", alt: 'Flickr logo'
-      = link_to flickr_auth.name, "https://flickr.com/photos/#{flickr_auth.uid}", target: '_blank', rel: 'noopener noreferrer'
+      = link_to flickr_auth.name, "https://flickr.com/photos/#{flickr_auth.uid}"
 
   - if member.show_email
     %p
-      = icon 'fas', 'envelope', class: 'fa-fw'
+      Email:
       = mail_to member.email

app/views/members/_map.html.haml

@@ -5,5 +5,5 @@
     = link_to member.location, place_path(member.location, anchor: "members")
 - else
   .location-not-set
-    %h1 Location not known or geocodable
-    %p We can't show you what's nearby
+    .sr-only Location not known
+    .sr-only We can't show you what's nearby

app/views/members/show.html.haml

@@ -21,21 +21,6 @@
         .row
           .col= render "bio", member: @member
           .col= render "avatar", member: @member
-        .row
-          .col
-            %p
-              %small
-                %a{href: "#content"}
-                  Skip to main content
-            - if @member.bio.blank?
-              - if can? :edit, @member
-                = link_to "Add a bio to complete your profile.", edit_member_registration_path
-              - else
-                #{@member.login_name} hasn't written a bio yet.
-            - else
-              :markdown
-                #{ strip_tags markdownify(@member.bio) }
-
         - if @member.roles.any?
           %p
             - @member.roles.each do |role|
@@ -45,16 +30,12 @@
             = icon 'fas', 'map-marker'
             = truncate(@member.location, length: 15, separator: ' ', omission: '... ')
         %p
-          %small
-            %strong Member since
-            %br
-            = @member.created_at.to_fs(:date)
+          %strong Member since
+          = @member.created_at.to_fs(:date)
         - if @member.last_sign_in_at
           %p
-            %small
-              %strong Last Login
-              %br
-              = @member.last_sign_in_at&.to_fs(:default)
+            %strong Last Login
+            = @member.last_sign_in_at&.to_fs(:default)
 
         - if can? :update, @member
           = link_to edit_member_registration_path, class: 'btn btn-block' do

app/views/photos/_actions.html.haml

@@ -1,7 +1,7 @@
 - if can?(:edit, @photo) && can?(:destroy, @photo)
   .dropdown.float-right.photo-actions
-    %a#photo-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
-    .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "photo-actions-button"}
+    %a#harvest-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
+    .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "harvest-actions-button"}
       = edit_button(edit_photo_path(@photo), classes: 'dropdown-item')
       .dropdown-divider
       = delete_button(@photo, classes: 'dropdown-item text-danger')

app/views/photos/_associations.html.haml

@@ -30,9 +30,3 @@
           = seed_icon
           = link_to t('photos.show.seed', seed: seed.to_s, owner: seed.owner.to_s), seed_path(seed)
           = render "association_delete_button", photo: @photo, type: 'seed', thing: seed
-
-      - @photo.crops.each do |crop|
-        %li
-          = crop_icon(crop)
-          = link_to t('photos.show.crop', crop: crop.to_s), crop_path(crop)
-          = render "association_delete_button", photo: @photo, type: 'crop', thing: crop

app/views/photos/show.html.haml

@@ -28,12 +28,12 @@
           = render 'crops/thumbnail', crop: crop
   .col-md-3
     %p
-      %span.btn= render 'photos/likes', photo: @photo
       = render 'photos/actions', photo: @photo
       = link_to @photo.link_url, class: 'btn btn-info' do
         - if @photo.source == 'flickr'
           = icon 'fab', 'flickr'
         View on #{@photo.source.titleize}
+      %span.btn= render 'photos/likes', photo: @photo
       - if @photo.date_taken.present?
         %h3 Taken on #{I18n.l @photo.date_taken.to_date}
 

app/views/plantings/_actions.html.haml

@@ -1,5 +1,5 @@
 - if can?(:edit, planting)
-  %span.dropdown.planting-actions
+  .dropdown.planting-actions
     %a#planting-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"}
       = planting_edit_button(planting, classes: 'dropdown-item')

app/views/plantings/_card.html.haml

@@ -31,10 +31,7 @@
         .text-center= render 'plantings/badges', planting: planting
         = render 'plantings/progress', planting: planting
     .card-footer
-      %small
-        Planted by
-        = link_to member_path(slug: planting.owner_slug), class: "owner-link" do
-          = planting.owner_login_name
-        in
-        = link_to garden_path(slug: planting.garden_slug), class: "garden-link" do
-          = planting.garden_name
+      .float-right
+        %span.chip.member-chip
+          = link_to member_path(slug: planting.owner_slug) do
+            = planting.owner_login_name

app/views/plantings/_form.html.haml

@@ -6,6 +6,7 @@
         %strong=yield :title
   = bootstrap_form_for(@planting) do |f|
     .card-body
+      = required_field_help_text
       - if @planting.errors.any?
         #error_explanation
           %h2
@@ -44,7 +45,7 @@
         .col-md-4
           = f.select(:sunniness, Planting::SUNNINESS_VALUES, { include_blank: '', label: 'Sun or shade?' } )
         .col-md-4
-          = f.number_field :quantity, label: 'How many?', min: 1
+          = f.number_field :quantity, label: 'How many?'
       = f.text_area :description, rows: 6, label: 'Tell us more about it'
 
       .row

app/views/plantings/show.html.haml

@@ -43,8 +43,6 @@
                   %strong #{@planting.age_in_days}/#{@planting.expected_lifespan} days
 
         = render 'timeline', planting: @planting
-      = render 'likes/likes', object: @planting
-      = render 'plantings/actions', planting: @planting
 
     .col-md-4.col-xs-12
       = render 'plantings/owner', planting: @planting
@@ -81,6 +79,8 @@
 
 
     .col-md-4.col-xs-12
+      = render 'plantings/actions', planting: @planting
+      %hr/
       = render @planting.crop
 
       - if @planting.location

app/views/posts/_likes.html.haml

@@ -0,0 +1,10 @@
+
+- if member_signed_in? && can?(:new, Like)
+  - if !post.liked_by?(current_member)
+    = link_to 'Like', likes_path(type: 'Post', id: post.id, format: :json),
+              method: :post, remote: true, class: 'post-like btn like-btn'
+  - else
+    = link_to 'Unlike', likes_path(type: 'Post', id: post.id, format: :json),
+              method: :delete, remote: true, class: 'post-like btn like-btn'
+
+= render 'likes/count', likeable: post, liked: member_signed_in? && post.liked_by?(current_member)

app/views/posts/show.html.haml

@@ -45,7 +45,7 @@
             = render 'photos/thumbnail', photo: photo
 
       .card-footer
-        = render 'likes/likes', object: @post
+        = render 'posts/likes', post: @post
         .float-right
           - if can? :create, Comment
             = link_to new_comment_path(post_id: @post.id), class: 'btn' do

app/views/seeds/_form.html.haml

@@ -14,6 +14,7 @@
           %ul
             - @seed.errors.full_messages.each do |msg|
               %li= msg
+      = required_field_help_text
 
       .form-group.required
         = f.label :crop, 'Crop'
@@ -22,7 +23,7 @@
           = f.hidden_field :parent_planting_id, value: @planting.id
         - else
 
-          = auto_suggest @seed, :crop, class: 'form-control', default: @crop, required: true
+          = auto_suggest @seed, :crop, class: 'form-control', default: @crop
           %span.help-inline
             Can't find what you're looking for?
             = link_to "Request new crops.", new_crop_path
@@ -31,7 +32,7 @@
           = f.text_field :saved_at,
                      value: @seed.saved_at ? @seed.saved_at.to_fs(:ymd) : '',
                      class: 'add-datepicker', label: 'When were the seeds harvested/saved?'
-        .col-12.col-md-4= f.number_field :quantity, label: 'Quantity', min: 1
+        .col-12.col-md-4= f.number_field :quantity, label: 'Quantity'
         .col-12.col-md-4
           = f.text_field :plant_before, class: 'add-datepicker',
           value: @seed.plant_before ? @seed.plant_before.to_fs(:ymd) : ''
@@ -45,21 +46,21 @@
           %span.help-inline= t('.finish_helper')
 
       .row
-        .col-md-6= f.number_field :days_until_maturity_min, label_as_placeholder: true, label: 'min', prepend: 'Days until maturity', min: 1
-        .col-md-6= f.number_field :days_until_maturity_max, label_as_placeholder: true, label: 'max', prepend: 'to', append: "days", min: 1
+        .col-md-6= f.number_field :days_until_maturity_min, label_as_placeholder: true, label: 'min', prepend: 'Days until maturity'
+        .col-md-6= f.number_field :days_until_maturity_max, label_as_placeholder: true, label: 'max', prepend: 'to', append: "days"
 
       .row
         .col-md-4
-          = f.select(:organic, Seed::ORGANIC_VALUES, {label: 'Organic?', wrapper: { class: 'required'}, required: true}, default: 'unknown')
+          = f.select(:organic, Seed::ORGANIC_VALUES, {label: 'Organic?', wrapper: { class: 'required'}}, default: 'unknown', required: true)
         .col-md-4
-          = f.select(:gmo, Seed::GMO_VALUES, {label: 'GMO?', wrapper: { class: 'required'}, required: true}, default: 'unknown')
+          = f.select(:gmo, Seed::GMO_VALUES, {label: 'GMO?', wrapper: { class: 'required'}}, default: 'unknown', required: true)
         .col-md-4
-          = f.select(:heirloom, Seed::HEIRLOOM_VALUES, {label: 'Heirloom?', wrapper: { class: 'required'}, required: true}, default: 'unknown')
+          = f.select(:heirloom, Seed::HEIRLOOM_VALUES, {label: 'Heirloom?', wrapper: { class: 'required'}}, default: 'unknown', required: true)
       = f.text_area :description, rows: 6
 
       %hr/
       =  t('.trade_help', site_name: ENV['GROWSTUFF_SITE_NAME'])
-      = f.select(:tradable_to, Seed::TRADABLE_TO_VALUES, {label: 'Will trade', wrapper: { class: 'required'}, required: true})
+      = f.select(:tradable_to, Seed::TRADABLE_TO_VALUES, {label: 'Will trade', wrapper: { class: 'required'}})
       %span.help_inline
         - if current_member.location.blank?
           Don't forget to

app/views/seeds/index.html.haml

@@ -17,14 +17,6 @@
       = check_box_tag 'active', 'all', @show_all
       include finished
     %hr/
-    %section.filters
-      %h2 Tradeable
-      %ul.nav.flex-column
-        %li.nav-item= link_to "All tradable seeds", seeds_path(tradeable_to: ['locally', 'nationally', 'internationally'])
-        - Seed::TRADABLE_TO_VALUES.each do |value|
-          - unless value == 'nowhere'
-            %li.nav-item= link_to value.capitalize, seeds_path(tradeable_to: value)
-    %hr/
     - if @owner
       = render @owner
     - if @crop

app/views/shared/editable/_date.html.haml

@@ -5,6 +5,7 @@
       = edit_icon
   .hide{id: "date--#{model.id}-#{field.to_s}"}
     = bootstrap_form_for(model) do |f|
-      = f.date_field field,
-               value: model.send(field) ? model.send(field).to_fs(:ymd) : '', label: 'When?'
+      = f.text_field field,
+               value: model.send(field) ? model.send(field).to_fs(:ymd) : '',
+               class: 'add-datepicker', label: 'When?'
       = f.submit :save

app/views/shared/editable/_form.html.haml

@@ -12,6 +12,7 @@
       - elsif field_type == :select
         = f.select field, collection
       - elsif field_type == :date
-        = f.date_field field,
-                 value: model.send(field) ? model.send(field).to_fs(:ymd) : '', label: 'When?'
+        = f.text_field field,
+                 value: model.send(field) ? model.send(field).to_fs(:ymd) : '',
+                 class: 'add-datepicker', label: 'When?'
       = f.submit :save

app/views/timeline/_photos.html.haml

@@ -24,9 +24,4 @@
         - photo.seeds.each do |seed|
           %li
             = seed_icon
-            = link_to t('photos.show.seed', seed: seed.to_s, owner: seed.owner.to_s), seed_path(seed)
-
-        - photo.crops.each do |crop|
-          %li
-            = crop_icon(crop)
-            = link_to t('photos.show.crop', crop: crop.to_s), crop_path(crop)
+            = link_to t('photos.show.seed', seed: seed.to_s, owner: seed.owner.to_s), seed_path(seed)

bin/setup

@@ -23,8 +23,12 @@ FileUtils.chdir APP_ROOT do
   system('bin/yarn')
 
   puts "\n== Copying sample files =="
-  FileUtils.cp 'config/database.yml.example', 'config/database.yml' unless File.exist?('config/database.yml')
-  FileUtils.cp 'env-example', '.env' unless File.exist?('.env')
+  unless File.exist?('config/database.yml')
+    FileUtils.cp 'config/database.yml.example', 'config/database.yml'
+  end
+  unless File.exist?('.env')
+    FileUtils.cp 'env-example', '.env'
+  end
 
   puts "\n== Checking for elastic search =="
   system! 'script/check_elasticsearch.sh'

config.ru

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

config/application.rb

@@ -62,7 +62,7 @@ module Growstuff
 
     # Growstuff-specific configuration variables
     config.currency = 'AUD'
-    config.bot_email = ENV.fetch('GROWSTUFF_EMAIL', nil)
+    config.bot_email = ENV['GROWSTUFF_EMAIL']
     config.user_agent = 'Growstuff'
     config.user_agent_email = "info@growstuff.org"
 
@@ -70,7 +70,7 @@ module Growstuff
     # API key can't be blank or tests fail
     Gibbon::API.timeout = 10
     Gibbon::API.throws_exceptions = false
-    config.newsletter_list_id = ENV.fetch('GROWSTUFF_MAILCHIMP_NEWSLETTER_ID', nil)
+    config.newsletter_list_id = ENV['GROWSTUFF_MAILCHIMP_NEWSLETTER_ID']
 
     # config.active_record.raise_in_transactional_callbacks = true
     config.middleware.insert_before 0, Rack::Cors do

config/environments/production.rb

@@ -27,7 +27,7 @@ Rails.application.configure do
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :terser
-  # config.assets.css_compressor = :sass
+# config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
@@ -59,8 +59,8 @@ Rails.application.configure do
   # Use a different cache store in production.
   config.cache_store = :mem_cache_store,
                        (ENV["MEMCACHIER_SERVERS"] || "").split(","),
-                       { username:             ENV.fetch("MEMCACHIER_USERNAME", nil),
-                         password:             ENV.fetch("MEMCACHIER_PASSWORD", nil),
+                       { username:             ENV["MEMCACHIER_USERNAME"],
+                         password:             ENV["MEMCACHIER_PASSWORD"],
                          failover:             true,
                          socket_timeout:       1.5,
                          socket_failure_delay: 0.2,
@@ -89,20 +89,20 @@ Rails.application.configure do
   config.active_record.dump_schema_after_migration = false
 
   # Growstuff configuration
-  config.action_mailer.default_url_options = { host: ENV.fetch('HOST', nil) }
+  config.action_mailer.default_url_options = { host: ENV['HOST'] }
 
   config.action_mailer.smtp_settings = {
-    user_name:            ENV.fetch('MAILGUN_SMTP_LOGIN', nil),
-    password:             ENV.fetch('MAILGUN_SMTP_PASSWORD', nil),
-    domain:               ENV.fetch('GROWSTUFF_EMAIL_DOMAIN', nil),
-    address:              ENV.fetch('MAILGUN_SMTP_SERVER', nil),
+    user_name:            ENV['MAILGUN_SMTP_LOGIN'],
+    password:             ENV['MAILGUN_SMTP_PASSWORD'],
+    domain:               ENV['GROWSTUFF_EMAIL_DOMAIN'],
+    address:              ENV['MAILGUN_SMTP_SERVER'],
     port:                 587,
     authentication:       :plain,
     enable_starttls_auto: true
   }
   ActionMailer::Base.delivery_method = :smtp
 
-  config.host = ENV.fetch('HOST', nil)
+  config.host = ENV['HOST']
   config.analytics_code = <<-GET_CLICKY_SCRIPT
     <script src="//static.getclicky.com/js" type="text/javascript"></script>
     <script type="text/javascript">try{ clicky.init(100594260); }catch(e){}</script>

config/factory_bot.rb

@@ -2,7 +2,7 @@
 
 ActionDispatch::Callbacks.after do
   # Reload the factories
-  return unless Rails.env.local?
+  return unless Rails.env.development? || Rails.env.test?
 
   if FactoryBot.factories.present? # first init will load factories, this should only run on subsequent reloads
     FactoryBot.factories.clear