Merge branch 'dev' into fix-naming

2026-04-11 02:18:11 -04:00 · 2025-03-29 14:24:31 +10:30
parent bcaeaf3688 01e8a4d572
commit df15383dd0
153 changed files with 1254 additions and 956 deletions
--- a/.devcontainer/.env
+++ b/.devcontainer/.env
@@ -1,2 +1,2 @@
 # Ruby version
-VARIANT=3.1.4
+VARIANT=3.3.4
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:0-3.1-bullseye
+FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye

 # Install Rails
 RUN gem install rails:7.0.8
@@ -24,3 +24,10 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

 # [Optional] Uncomment this line to install global node packages.
 # RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
+
+# We run as the vscode user.
+# 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/"
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,53 +7,10 @@ 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
+
--- a/.github/workflows/brakeman-analysis.yml
+++ b/.github/workflows/brakeman-analysis.yml
@@ -1,40 +0,0 @@
-# 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
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -106,15 +106,37 @@ jobs:

      - name: Prepare database for testing
        run: bundle exec rails db:prepare
-        
+
+
+      - 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: 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
+        run: bundle exec rspec spec/features/ -fd --fail-fast

      - name: Report to code climate
        run: |
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,13 +1,17 @@
 inherit_from: .rubocop_todo.yml
 require:
+ - rubocop-factory_bot
+ - rubocop-capybara
 - rubocop-rails
 - rubocop-rspec
+ - rubocop-rspec_rails
+ - rubocop-rake
 AllCops:
  NewCops: enable
  Exclude:
    - 'db/schema.rb'
    - 'vendor/**/*'
-  TargetRailsVersion: 7.0
+  TargetRailsVersion: 7.1

 Rails:
  Enabled: true
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,15 +1,37 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-09-16 07:51:19 UTC using RuboCop version 1.56.3.
+# on 2024-07-13 05:47:38 UTC using RuboCop version 1.65.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.

-# Offense count: 15
+# Offense count: 231
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: link_or_button, strict
+Capybara/ClickLinkOrButtonStyle:
+  Enabled: false
+
+# Offense count: 39
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: DefaultSelector.
+Capybara/RSpec/HaveSelector:
+  Exclude:
+    - 'spec/features/conversations/index_spec.rb'
+    - 'spec/features/footer_spec.rb'
+    - 'spec/features/gardens/adding_gardens_spec.rb'
+    - 'spec/features/harvests/harvesting_a_crop_spec.rb'
+    - 'spec/features/members/list_spec.rb'
+    - 'spec/features/plantings/planting_a_crop_spec.rb'
+    - 'spec/features/seeds/adding_seeds_spec.rb'
+    - 'spec/features/shared_examples/crop_suggest.rb'
+    - 'spec/helpers/application_helper_spec.rb'
+    - 'spec/support/feature_helpers.rb'
+    - 'spec/views/posts/show.html.haml_spec.rb'
+
+# Offense count: 14
 Capybara/SpecificMatcher:
  Exclude:
-    - 'spec/features/crops/browse_crops_spec.rb'
    - 'spec/features/footer_spec.rb'
    - 'spec/features/gardens/adding_gardens_spec.rb'
    - 'spec/features/harvests/harvesting_a_crop_spec.rb'
@@ -23,8 +45,7 @@ Capybara/VisibilityMatcher:

 # Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include, EnforcedStyle, NonImplicitAssociationMethodNames.
-# Include: spec/factories.rb, spec/factories/**/*.rb, features/support/factories/**/*.rb
+# Configuration parameters: EnforcedStyle, NonImplicitAssociationMethodNames.
 # SupportedStyles: explicit, implicit
 FactoryBot/AssociationStyle:
  Exclude:
@@ -33,81 +54,48 @@ FactoryBot/AssociationStyle:
    - 'spec/factories/like.rb'
    - 'spec/factories/scientific_name.rb'

-# Offense count: 8
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include, EnforcedStyle, ExplicitOnly.
-# Include: **/*_spec.rb, **/spec/**/*, spec/factories.rb, spec/factories/**/*.rb, features/support/factories/**/*.rb
+# Configuration parameters: AutoCorrect, Include, EnforcedStyle, ExplicitOnly.
+# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
 # SupportedStyles: create_list, n_times
 FactoryBot/CreateList:
  Exclude:
-    - 'spec/factories/member.rb'
-    - 'spec/helpers/gardens_helper_spec.rb'
    - 'spec/views/comments/index.rss.haml_spec.rb'
-    - 'spec/views/home/index_spec.rb'
    - 'spec/views/photos/index.html.haml_spec.rb'
-    - 'spec/views/places/show.html.haml_spec.rb'
    - 'spec/views/posts/index.html.haml_spec.rb'

-# Offense count: 1135
+# Offense count: 4
+# Configuration parameters: Include, MaxAmount.
+# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
+FactoryBot/ExcessiveCreateList:
+  Exclude:
+    - 'spec/controllers/posts_controller_spec.rb'
+    - 'spec/features/crops/show_spec.rb'
+    - 'spec/features/percy/percy_spec.rb'
+
+# Offense count: 1127
 # This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Include.
+# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
 FactoryBot/SyntaxMethods:
  Enabled: false

-# Offense count: 5
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: 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: 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: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 304
+  Exclude:
+    - 'app/helpers/crops_helper.rb'
+    - 'db/seeds.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: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: RequireParenthesesForMethodChains.
 Lint/AmbiguousRange:
  Exclude:
+    - 'app/models/concerns/search_activities.rb'
    - 'app/models/concerns/search_harvests.rb'
    - 'app/models/concerns/search_plantings.rb'

@@ -130,6 +118,12 @@ Lint/EmptyBlock:
    - 'spec/features/crops/crop_detail_page_spec.rb'
    - 'spec/requests/authentications_spec.rb'

+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'db/migrate/20230313015323_create_active_storage_tables.active_storage.rb'
+
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/RedundantDirGlobSort:
@@ -142,48 +136,46 @@ Lint/SuppressedException:
  Exclude:
    - 'lib/tasks/testing.rake'

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

-# Offense count: 45
+# Offense count: 52
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
  Max: 151

-# Offense count: 10
+# Offense count: 14
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 61
+  Max: 115

-# Offense count: 6
+# Offense count: 7
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 171
+  Max: 188

-# Offense count: 4
+# Offense count: 6
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
  Max: 32

-# Offense count: 61
+# Offense count: 71
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 59
+  Max: 127

-# Offense count: 3
+# Offense count: 2
+# Configuration parameters: CountComments, CountAsOne.
+Metrics/ModuleLength:
+  Max: 125
+
+# Offense count: 5
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
  Max: 32
@@ -202,7 +194,7 @@ RSpec/ContextWording:

 # Offense count: 36
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: SkipBlocks, EnforcedStyle.
+# Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
 # SupportedStyles: described_class, explicit
 RSpec/DescribedClass:
  Exclude:
@@ -212,6 +204,7 @@ RSpec/DescribedClass:

 # Offense count: 13
 # This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect.
 RSpec/EmptyExampleGroup:
  Exclude:
    - 'spec/controllers/authentications_controller_spec.rb'
@@ -227,24 +220,26 @@ RSpec/EmptyExampleGroup:
    - 'spec/views/photos/edit.html.haml_spec.rb'
    - 'spec/views/posts/_single.html.haml_spec.rb'

-# Offense count: 134
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowConsecutiveOneLiners.
+RSpec/EmptyLineAfterExample:
+  Exclude:
+    - 'spec/models/ability_spec.rb'
+
+# Offense count: 140
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
  Max: 25

-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/ExcessiveDocstringSpacing:
-  Exclude:
-    - 'spec/controllers/crops_controller_spec.rb'
-    - 'spec/features/crops/crop_photos_spec.rb'
-
-# Offense count: 30
+# Offense count: 32
 RSpec/ExpectInHook:
  Exclude:
    - 'spec/controllers/garden_types_controller_spec.rb'
    - 'spec/controllers/gardens_controller_spec.rb'
    - 'spec/features/admin/forums_spec.rb'
+    - 'spec/features/admin/plant_parts_spec.rb'
+    - 'spec/features/admin/roles_spec.rb'
    - 'spec/features/crops/crop_photos_spec.rb'
    - 'spec/features/members/list_spec.rb'
    - 'spec/features/plantings/planting_a_crop_spec.rb'
@@ -260,11 +255,12 @@ RSpec/HookArgument:

 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect.
 RSpec/HooksBeforeExamples:
  Exclude:
    - 'spec/features/crops/creating_a_crop_spec.rb'

-# Offense count: 35
+# Offense count: 37
 # Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
 RSpec/IndexedLet:
  Exclude:
@@ -272,6 +268,7 @@ RSpec/IndexedLet:
    - 'spec/controllers/plantings_controller_spec.rb'
    - 'spec/features/crops/crop_photos_spec.rb'
    - 'spec/features/members/list_spec.rb'
+    - 'spec/features/members/profile_spec.rb'
    - 'spec/features/percy/percy_spec.rb'
    - 'spec/features/planting_reminder_spec.rb'
    - 'spec/features/timeline/index_spec.rb'
@@ -279,7 +276,7 @@ RSpec/IndexedLet:
    - 'spec/models/member_spec.rb'
    - 'spec/views/forums/index.html.haml_spec.rb'

-# Offense count: 710
+# Offense count: 720
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
  Enabled: false
@@ -288,6 +285,12 @@ RSpec/InstanceVariable:
 RSpec/LetSetup:
  Enabled: false

+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/MatchArray:
+  Exclude:
+    - 'spec/models/post_spec.rb'
+
 # Offense count: 2
 RSpec/MessageChain:
  Exclude:
@@ -304,16 +307,16 @@ RSpec/MultipleDescribes:
  Exclude:
    - 'spec/features/crops/crop_wranglers_spec.rb'

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

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

-# Offense count: 132
+# Offense count: 133
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
@@ -324,7 +327,7 @@ RSpec/NamedSubject:
 RSpec/NestedGroups:
  Max: 6

-# Offense count: 407
+# Offense count: 403
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
@@ -336,21 +339,6 @@ RSpec/PendingWithoutReason:
    - 'spec/features/seeds/misc_seeds_spec.rb'
    - 'spec/features/unsubscribing_spec.rb'

-# Offense count: 7
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/Rails/HaveHttpStatus:
-  Exclude:
-    - 'spec/controllers/api/v1/plantings_controller_spec.rb'
-    - 'spec/controllers/harvests_controller_spec.rb'
-    - 'spec/controllers/likes_controller_spec.rb'
-    - 'spec/requests/harvests_spec.rb'
-
-# Offense count: 16
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Inferences.
-RSpec/Rails/InferredSpecType:
-  Enabled: false
-
 # Offense count: 2
 RSpec/RepeatedDescription:
  Exclude:
@@ -370,6 +358,7 @@ RSpec/RepeatedExampleGroupBody:

 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect.
 RSpec/ScatteredSetup:
  Exclude:
    - 'spec/features/percy/percy_spec.rb'
@@ -382,14 +371,6 @@ RSpec/SpecFilePathFormat:
  Exclude:
    - 'spec/controllers/member_controller_spec.rb'

-# Offense count: 2
-# Configuration parameters: Include.
-# Include: **/*_spec*rb*, **/spec/**/*
-RSpec/SpecFilePathSuffix:
-  Exclude:
-    - 'spec/features/seeds/seed_photos.rb'
-    - 'spec/models/garden_type.rb'
-
 # Offense count: 3
 RSpec/StubbedMock:
  Exclude:
@@ -413,7 +394,24 @@ RSpec/VerifiedDoubles:
    - 'spec/controllers/gardens_controller_spec.rb'
    - 'spec/views/devise/shared/_links_spec.rb'

-# Offense count: 26
+# Offense count: 7
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ResponseMethods.
+# ResponseMethods: response, last_response
+RSpecRails/HaveHttpStatus:
+  Exclude:
+    - 'spec/controllers/api/v1/plantings_controller_spec.rb'
+    - 'spec/controllers/harvests_controller_spec.rb'
+    - 'spec/controllers/likes_controller_spec.rb'
+    - 'spec/requests/harvests_spec.rb'
+
+# Offense count: 16
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Inferences.
+RSpecRails/InferredSpecType:
+  Enabled: false
+
+# Offense count: 28
 # Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql
 # Include: db/**/*.rb
@@ -436,17 +434,6 @@ Rails/Date:
  Exclude:
    - 'app/mailers/notifier_mailer.rb'

-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: slashes, arguments
-Rails/FilePath:
-  Exclude:
-    - 'app/controllers/crops_controller.rb'
-    - 'config/application.rb'
-    - 'config/environments/development.rb'
-    - 'db/seeds.rb'
-
 # Offense count: 11
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -485,12 +472,13 @@ Rails/I18nLocaleAssignment:
 Rails/I18nLocaleTexts:
  Enabled: false

-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: Include.
 # Include: app/controllers/**/*.rb, app/mailers/**/*.rb
 Rails/LexicallyScopedActionFilter:
  Exclude:
    - 'app/controllers/data_controller.rb'
+    - 'app/controllers/registrations_controller.rb'

 # Offense count: 2
 Rails/OutputSafety:
@@ -498,6 +486,12 @@ Rails/OutputSafety:
    - 'app/helpers/auto_suggest_helper.rb'
    - 'app/helpers/gardens_helper.rb'

+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Rails/PluralizationGrammar:
+  Exclude:
+    - 'spec/requests/plantings_spec.rb'
+
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Include.
@@ -508,8 +502,10 @@ Rails/RakeEnvironment:
    - 'lib/tasks/i18n.rake'
    - 'lib/tasks/testing.rake'

-# Offense count: 10
+# Offense count: 9
 # This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedReceivers.
+# AllowedReceivers: ActionMailer::Preview, ActiveSupport::TimeZone
 Rails/RedundantActiveRecordAllMethod:
  Exclude:
    - 'app/controllers/admin/roles_controller.rb'
@@ -518,7 +514,6 @@ Rails/RedundantActiveRecordAllMethod:
    - 'app/controllers/plant_parts_controller.rb'
    - 'app/controllers/scientific_names_controller.rb'
    - 'app/services/openfarm_service.rb'
-    - 'spec/features/members/deletion_spec.rb'
    - 'spec/features/percy/percy_spec.rb'
    - 'spec/models/harvest_spec.rb'

@@ -541,8 +536,8 @@ Rails/ResponseParsedBody:
    - 'spec/controllers/likes_controller_spec.rb'
    - 'spec/requests/api/v1/crop_request_spec.rb'
    - 'spec/requests/api/v1/gardens_request_spec.rb'
-    - 'spec/requests/api/v1/harvest_request_spec.rb'
-    - 'spec/requests/api/v1/member_request_spec.rb'
+    - 'spec/requests/api/v1/harvests_request_spec.rb'
+    - 'spec/requests/api/v1/members_request_spec.rb'
    - 'spec/requests/api/v1/photos_request_spec.rb'
    - 'spec/requests/api/v1/plantings_request_spec.rb'
    - 'spec/requests/api/v1/seeds_request_spec.rb'
@@ -562,26 +557,11 @@ Rails/RootPathnameMethods:
    - 'app/controllers/crops_controller.rb'
    - 'app/helpers/icons_helper.rb'

-# Offense count: 20
+# Offense count: 21
 # Configuration parameters: Include.
 # Include: db/**/*.rb
 Rails/ThreeStateBooleanColumn:
-  Exclude:
-    - 'db/migrate/20121203034745_add_tos_agreement_to_users.rb'
-    - 'db/migrate/20130206051328_add_show_email_to_member.rb'
-    - 'db/migrate/20130212123628_create_notifications.rb'
-    - 'db/migrate/20130327120024_add_send_email_to_member.rb'
-    - 'db/migrate/20130517051922_create_account_types.rb'
-    - 'db/migrate/20130718011247_add_trading_to_seeds.rb'
-    - 'db/migrate/20130722050836_remove_tradable_from_seeds.rb'
-    - 'db/migrate/20130827105823_add_newsletter_to_member.rb'
-    - 'db/migrate/20131025104228_add_fields_to_gardens.rb'
-    - 'db/migrate/20140829230600_add_finished_to_planting.rb'
-    - 'db/migrate/20140928085713_add_send_planting_reminder_to_member.rb'
-    - 'db/migrate/20171022032108_all_the_predictions.rb'
-    - 'db/migrate/20180213005731_seed_usage.rb'
-    - 'db/migrate/20190720000555_create_mailboxer.mailboxer_engine.rb'
-    - 'db/migrate/20190720000558_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb'
+  Enabled: false

 # Offense count: 6
 # Configuration parameters: Include.
@@ -603,6 +583,18 @@ Rails/WhereEquals:
    - 'app/models/harvest.rb'
    - 'app/models/planting.rb'

+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Rails/WhereRange:
+  Exclude:
+    - 'app/models/concerns/predict_planting.rb'
+    - 'app/models/garden.rb'
+
+# Offense count: 1
+Rake/MethodDefinitionInTask:
+  Exclude:
+    - 'lib/tasks/growstuff.rake'
+
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
@@ -622,13 +614,7 @@ 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: 4
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
@@ -636,33 +622,16 @@ Style/FrozenStringLiteralComment:
  Exclude:
    - 'config/initializers/new_framework_defaults_6_0.rb'
    - 'db/migrate/20200801084007_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb'
-    - 'db/migrate/20200815012538_remove_median_function.rb'
    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'

-# Offense count: 2
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
  Exclude:
    - 'config/environments/production.rb'
+    - 'lib/tasks/gbif.rake'
    - 'lib/tasks/openfarm.rake'

-# 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
-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: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'bin/setup'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods.
@@ -684,19 +653,23 @@ Style/MixinUsage:
    - 'spec/rails_helper.rb'

 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/NegatedIfElseCondition:
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
  Exclude:
-    - 'app/helpers/crops_helper.rb'
+    - 'app/models/activity.rb'

-# Offense count: 3
+# Offense count: 5
 # 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'

 # Offense count: 6
 Style/OpenStructUse:
@@ -710,15 +683,6 @@ 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.
@@ -726,12 +690,6 @@ 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.
@@ -739,19 +697,6 @@ Style/RedundantFetchBlock:
  Exclude:
    - 'config/puma.rb'

-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-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/messages_controller.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowModifier.
@@ -760,7 +705,7 @@ Style/SoleNestedConditional:
    - 'app/controllers/application_controller.rb'
    - 'app/controllers/messages_controller.rb'

-# Offense count: 20
+# Offense count: 24
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.4
+3.3.4
--- a/8
+++ b/8
@@ -5,13 +5,13 @@ source 'https://rubygems.org'
 # Match ruby version in .ruby-version
 ruby File.read('.ruby-version')

-gem 'rails', '~> 7.1.0'
+gem 'rails', '~> 7.2.0'

 # Keeping old sprockets
 # https://github.com/rails/sprockets-rails/issues/444#issuecomment-637817050
 gem "sprockets", "<4"

-gem 'bundler', '>= 2.3.10'
+gem 'bundler', '>= 2.4.22'

 gem 'coffee-rails'
 gem 'haml'
@@ -167,8 +167,12 @@ group :development, :test do
  gem 'rspec-activemodel-mocks'
  gem 'rspec-rails'             # unit testing framework
  gem 'rswag-specs'
+  gem 'rubocop-capybara'
+  gem 'rubocop-factory_bot'
  gem 'rubocop-rails'
+  gem 'rubocop-rake'
  gem 'rubocop-rspec'
+  gem 'rubocop-rspec_rails'
  gem 'webrat'                  # provides HTML matchers for view tests

  gem 'dotenv-rails'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,51 +33,46 @@ GEM
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actioncable (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    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
+    actionmailbox (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activejob (= 7.2.2.1)
+      activerecord (= 7.2.2.1)
+      activestorage (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
+      mail (>= 2.8.0)
+    actionmailer (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      actionview (= 7.2.2.1)
+      activejob (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
+      mail (>= 2.8.0)
      rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.4)
-      actionview (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionpack (7.2.2.1)
+      actionview (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
      nokogiri (>= 1.8.5)
      racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
      rack-session (>= 1.0.1)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    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)
+      useragent (~> 0.16)
+    actiontext (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activerecord (= 7.2.2.1)
+      activestorage (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionview (7.2.2.1)
+      activesupport (= 7.2.2.1)
      builder (~> 3.1)
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
@@ -85,52 +80,56 @@ GEM
    active_link_to (1.0.5)
      actionpack
      addressable
-    active_median (0.4.1)
-      activesupport (>= 6.1)
+    active_median (0.5.0)
+      activesupport (>= 7)
    active_record_union (1.3.0)
      activerecord (>= 4.0)
-    active_utils (3.4.1)
+    active_utils (3.5.0)
      activesupport (>= 4.2)
      i18n
-    activejob (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activejob (7.2.2.1)
+      activesupport (= 7.2.2.1)
      globalid (>= 0.3.6)
-    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)
+    activemodel (7.2.2.1)
+      activesupport (= 7.2.2.1)
+    activerecord (7.2.2.1)
+      activemodel (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
      timeout (>= 0.4.0)
-    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)
+    activestorage (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activejob (= 7.2.2.1)
+      activerecord (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
      marcel (~> 1.0)
-    activesupport (7.1.3.4)
+    activesupport (7.2.2.1)
      base64
+      benchmark (>= 0.3)
      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
      connection_pool (>= 2.2.5)
      drb
      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
-    ast (2.4.2)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    ast (2.4.3)
    autoprefixer-rails (10.4.16.0)
      execjs (~> 2)
-    axe-core-api (4.9.1)
+    axe-core-api (4.10.2)
      dumb_delegator
+      ostruct
      virtus
-    axe-core-capybara (4.9.1)
-      axe-core-api (= 4.9.1)
+    axe-core-capybara (4.10.2)
+      axe-core-api (= 4.10.2)
      dumb_delegator
-    axe-core-rspec (4.9.1)
-      axe-core-api (= 4.9.1)
+    axe-core-rspec (4.10.2)
+      axe-core-api (= 4.10.2)
      dumb_delegator
+      ostruct
      virtus
    axiom-types (0.1.1)
      descendants_tracker (~> 0.0.4)
@@ -138,11 +137,12 @@ GEM
      thread_safe (~> 0.3, >= 0.3.1)
    base64 (0.2.0)
    bcrypt (3.1.20)
+    benchmark (0.4.0)
    better_errors (2.10.1)
      erubi (>= 1.0.0)
      rack (>= 0.9.0)
      rouge (>= 1.0.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
    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 (7.1.6)
+    bullet (8.0.1)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
-    byebug (11.1.3)
+    byebug (12.0.0)
    cancancan (3.6.1)
    capybara (3.40.0)
      addressable
@@ -183,7 +183,7 @@ GEM
      image_processing (~> 1.1)
      marcel (~> 1.0.0)
      ssrf_filter (~> 1.0)
-    chartkick (5.0.7)
+    chartkick (5.1.4)
    childprocess (5.0.0)
    codeclimate-test-reporter (1.0.9)
      simplecov (<= 0.13)
@@ -199,20 +199,21 @@ GEM
    coffee-script-source (1.12.2)
    comfy_bootstrap_form (4.0.9)
      rails (>= 5.0.0)
-    concurrent-ruby (1.3.3)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
    crass (1.0.6)
-    csv (3.3.0)
-    csv_shaper (1.3.2)
+    csv (3.3.1)
+    csv_shaper (1.4.0)
      activesupport (>= 3.0.0)
+      csv
    dalli (3.2.8)
-    database_cleaner (2.0.2)
+    database_cleaner (2.1.0)
      database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.1.0)
+    database_cleaner-active_record (2.2.0)
      activerecord (>= 5.a)
      database_cleaner-core (~> 2.0.0)
    database_cleaner-core (2.0.1)
-    date (3.3.4)
+    date (3.4.1)
    descendants_tracker (0.0.4)
      thread_safe (~> 0.3, >= 0.3.1)
    devise (4.9.4)
@@ -221,13 +222,13 @@ GEM
      railties (>= 4.1.0)
      responders
      warden (~> 1.2.3)
-    diff-lcs (1.5.1)
-    discard (1.3.0)
-      activerecord (>= 4.2, < 8)
+    diff-lcs (1.6.0)
+    discard (1.4.0)
+      activerecord (>= 4.2, < 9.0)
    docile (1.1.5)
-    dotenv (3.1.2)
-    dotenv-rails (3.1.2)
-      dotenv (= 3.1.2)
+    dotenv (3.1.7)
+    dotenv-rails (3.1.7)
+      dotenv (= 3.1.7)
      railties (>= 6.1)
    drb (2.2.1)
    dumb_delegator (1.0.0)
@@ -244,22 +245,24 @@ GEM
    elasticsearch-transport (7.0.0)
      faraday
      multi_json
-    erubi (1.13.0)
+    erubi (1.13.1)
    erubis (2.7.0)
-    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.10.0)
-      faraday-net_http (>= 2.0, < 3.2)
+    excon (1.2.5)
      logger
-    faraday-net_http (3.1.0)
-      net-http
+    execjs (2.10.0)
+    factory_bot (6.5.0)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.4.4)
+      factory_bot (~> 6.5)
+      railties (>= 5.0.0)
+    faker (3.5.1)
+      i18n (>= 1.8.11, < 2)
+    faraday (2.12.2)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
    ffi (1.16.3)
    flickraw (0.9.10)
    font-awesome-sass (5.15.1)
@@ -267,7 +270,7 @@ GEM
    friendly_id (5.5.1)
      activerecord (>= 4.0.0)
    gbifrb (0.2.0)
-    geocoder (1.8.3)
+    geocoder (1.8.5)
      base64 (>= 0.1.0)
      csv (>= 3.0.0)
    gibbon (1.2.1)
@@ -293,26 +296,29 @@ GEM
      activesupport (>= 5.1)
      haml (>= 4.0.6)
      railties (>= 5.1)
-    haml_lint (0.58.0)
+    haml_lint (0.61.1)
      haml (>= 5.0)
      parallel (~> 1.10)
      rainbow
      rubocop (>= 1.0)
      sysexits (~> 1.1)
    hashie (5.0.0)
-    heroics (0.1.2)
+    heroics (0.1.3)
+      base64
      erubis (~> 2.0)
      excon
      moneta
      multi_json (>= 1.9.2)
      webrick
-    highline (3.0.1)
-    httparty (0.21.0)
+    highline (3.1.2)
+      reline
+    httparty (0.22.0)
+      csv
      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
-    i18n (1.14.5)
+    i18n (1.14.7)
      concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.14)
+    i18n-tasks (1.0.15)
      activesupport (>= 4.0.2)
      ast (>= 2.1.0)
      erubi
@@ -321,25 +327,28 @@ 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.10.1)
+    icalendar (2.10.3)
      ice_cube (~> 0.16)
-    ice_cube (0.16.4)
+      ostruct
+    ice_cube (0.17.0)
    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.7.2)
-    irb (1.13.2)
+    io-console (0.8.0)
+    irb (1.15.1)
+      pp (>= 0.6.0)
      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.7.2)
-    json-schema (4.1.1)
-      addressable (>= 2.8)
+    json (2.10.2)
+    json-schema (5.1.0)
+      addressable (~> 2.8)
    jsonapi-resources (0.10.7)
      activerecord (>= 4.1)
      concurrent-ruby
@@ -348,20 +357,21 @@ GEM
    kgio (2.11.4)
    kramdown (2.4.0)
      rexml
-    language_server-protocol (3.17.0.3)
-    launchy (3.0.0)
+    language_server-protocol (3.17.0.4)
+    launchy (3.0.1)
      addressable (~> 2.8)
      childprocess (~> 5.0)
-    leaflet-rails (1.9.4)
+    leaflet-rails (1.9.5)
      actionpack (>= 4.2.0)
      railties (>= 4.2.0)
    letter_opener (1.10.0)
      launchy (>= 2.2, < 4)
+    lint_roller (1.1.0)
    listen (3.9.0)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.0)
-    loofah (2.22.0)
+    logger (1.7.0)
+    loofah (2.24.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
    mail (2.8.1)
@@ -380,22 +390,22 @@ GEM
      railties (>= 3.2)
    matrix (0.4.2)
    memcachier (0.0.2)
-    method_source (1.0.0)
+    method_source (1.1.0)
    mimemagic (0.4.3)
      nokogiri (~> 1)
      rake
    mini_magick (4.12.0)
    mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.24.1)
+    mini_portile2 (2.8.8)
+    minitest (5.25.5)
    moneta (1.0.0)
-    msgpack (1.7.2)
+    msgpack (1.8.0)
    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    mutex_m (0.2.0)
-    net-http (0.4.1)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
+    net-http (0.6.0)
      uri
-    net-imap (0.4.11)
+    net-imap (0.4.19)
      date
      net-protocol
    net-pop (0.1.2)
@@ -404,15 +414,16 @@ GEM
      timeout
    net-smtp (0.5.0)
      net-protocol
-    nio4r (2.7.3)
-    nokogiri (1.16.6)
+    nio4r (2.7.4)
+    nokogiri (1.18.4)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-linux)
+    nokogiri (1.18.4-x86_64-linux-gnu)
      racc (~> 1.4)
    oauth (0.5.6)
-    oj (3.16.4)
+    oj (3.16.10)
      bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
    omniauth (1.9.2)
      hashie (>= 3.4.6)
      rack (>= 1.6.2, < 3)
@@ -426,29 +437,35 @@ GEM
      omniauth-oauth (~> 1.1)
      rack
    orm_adapter (0.5.0)
-    parallel (1.25.1)
-    parser (3.3.3.0)
+    ostruct (0.6.1)
+    parallel (1.26.3)
+    parser (3.3.7.3)
      ast (~> 2.4.1)
      racc
    percy-capybara (5.0.0)
      capybara (>= 3)
-    pg (1.5.6)
-    platform-api (3.7.0)
+    pg (1.5.9)
+    platform-api (3.8.0)
      heroics (~> 0.1.1)
      moneta (~> 1.0.0)
      rate_throttle_client (~> 0.1.0)
    popper_js (2.11.8)
-    pry (0.14.2)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.4.0)
+    pry (0.15.2)
      coderay (~> 1.1)
      method_source (~> 1.0)
-    psych (5.1.2)
+    psych (5.2.3)
+      date
      stringio
-    public_suffix (5.0.5)
-    puma (6.4.2)
+    public_suffix (6.0.1)
+    puma (6.6.0)
      nio4r (~> 2.0)
-    query_diet (0.7.1)
-    racc (1.8.0)
-    rack (2.2.9)
+    query_diet (0.7.2)
+    racc (1.8.1)
+    rack (2.2.13)
    rack-cors (2.0.2)
      rack (>= 2.0.0)
    rack-protection (3.2.0)
@@ -456,25 +473,25 @@ GEM
      rack (~> 2.2, >= 2.2.4)
    rack-session (1.0.2)
      rack (< 3)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
      rack (>= 1.3)
-    rackup (1.0.0)
+    rackup (1.0.1)
      rack (< 3)
      webrick
-    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)
+    rails (7.2.2.1)
+      actioncable (= 7.2.2.1)
+      actionmailbox (= 7.2.2.1)
+      actionmailer (= 7.2.2.1)
+      actionpack (= 7.2.2.1)
+      actiontext (= 7.2.2.1)
+      actionview (= 7.2.2.1)
+      activejob (= 7.2.2.1)
+      activemodel (= 7.2.2.1)
+      activerecord (= 7.2.2.1)
+      activestorage (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
      bundler (>= 1.15.0)
-      railties (= 7.1.3.4)
+      railties (= 7.2.2.1)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
      actionview (>= 5.0.1.rc1)
@@ -483,10 +500,10 @@ GEM
      activesupport (>= 5.0.0)
      minitest
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    rails-i18n (7.0.9)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    rails-i18n (7.0.10)
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 8)
    rails_12factor (0.0.3)
@@ -494,99 +511,114 @@ GEM
      rails_stdout_logging
    rails_serve_static_assets (0.0.5)
    rails_stdout_logging (0.0.5)
-    railties (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      irb
+    railties (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
+      irb (~> 1.13)
      rackup (>= 1.0.0)
      rake (>= 12.2)
      thor (~> 1.0, >= 1.2.2)
      zeitwerk (~> 2.6)
    rainbow (3.1.1)
-    raindrops (0.20.0)
+    raindrops (0.20.1)
    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.7.0)
+    rdoc (6.12.0)
      psych (>= 4.0.0)
-    recaptcha (5.17.0)
-    redis-client (0.22.2)
+    recaptcha (5.19.0)
+    redis-client (0.23.2)
      connection_pool
-    regexp_parser (2.9.2)
-    reline (0.5.9)
+    regexp_parser (2.10.0)
+    reline (0.6.0)
      io-console (~> 0.5)
    responders (3.1.1)
      actionpack (>= 5.2)
      railties (>= 5.2)
-    rexml (3.3.1)
-      strscan
+    rexml (3.4.1)
    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.2.0)
+    rspec-activemodel-mocks (1.2.1)
      activemodel (>= 3.0)
      activesupport (>= 3.0)
      rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.3)
      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.13.0)
-    rspec-rails (6.1.3)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
+    rspec-rails (7.1.1)
+      actionpack (>= 7.0)
+      activesupport (>= 7.0)
+      railties (>= 7.0)
      rspec-core (~> 3.13)
      rspec-expectations (~> 3.13)
      rspec-mocks (~> 3.13)
      rspec-support (~> 3.13)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
    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)
+    rswag-api (2.16.0)
+      activesupport (>= 5.2, < 8.1)
+      railties (>= 5.2, < 8.1)
+    rswag-specs (2.16.0)
+      activesupport (>= 5.2, < 8.1)
+      json-schema (>= 2.2, < 6.0)
+      railties (>= 5.2, < 8.1)
      rspec-core (>= 2.14)
-    rswag-ui (2.13.0)
-      actionpack (>= 3.1, < 7.2)
-      railties (>= 3.1, < 7.2)
-    rubocop (1.64.1)
+    rswag-ui (2.16.0)
+      actionpack (>= 5.2, < 8.1)
+      railties (>= 5.2, < 8.1)
+    rubocop (1.75.1)
      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
      parallel (~> 1.10)
      parser (>= 3.3.0.2)
      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.43.0, < 2.0)
      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
-      parser (>= 3.3.1.0)
-    rubocop-rails (2.25.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.43.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.30.3)
      activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
      rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.2)
-      rubocop (~> 1.61)
+      rubocop (>= 1.72.1, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.5.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)
    ruby-progressbar (1.13.0)
-    ruby-units (4.0.3)
+    ruby-units (4.1.0)
    ruby-vips (2.2.1)
      ffi (~> 1.12)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
    sass (3.7.4)
      sass-listen (~> 4.0.0)
    sass-listen (4.0.0)
@@ -600,19 +632,20 @@ GEM
      sprockets (> 3.0)
      sprockets-rails
      tilt
-    scout_apm (5.3.8)
+    scout_apm (5.6.1)
      parser
    searchkick (5.3.1)
      activemodel (>= 6.1)
      hashie
-    selenium-webdriver (4.22.0)
+    securerandom (0.4.1)
+    selenium-webdriver (4.30.1)
      base64 (~> 0.2)
      logger (~> 1.4)
      rexml (~> 3.2, >= 3.2.5)
      rubyzip (>= 1.2.2, < 3.0)
      websocket (~> 1.0)
-    sidekiq (7.3.0)
-      concurrent-ruby (< 2)
+    sidekiq (7.3.9)
+      base64
      connection_pool (>= 2.3.0)
      logger
      rack (>= 2.2.4)
@@ -622,7 +655,7 @@ GEM
      json (>= 1.8, < 3)
      simplecov-html (~> 0.10.0)
    simplecov-html (0.10.2)
-    sprockets (3.7.3)
+    sprockets (3.7.5)
      base64
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
@@ -631,32 +664,35 @@ GEM
      activesupport (>= 5.2)
      sprockets (>= 3.0.0)
    ssrf_filter (1.1.2)
-    stringio (3.1.1)
-    strscan (3.1.0)
+    stringio (3.1.5)
    sysexits (1.2.0)
    temple (0.10.3)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    terser (1.2.3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    terser (1.2.5)
      execjs (>= 0.3.0, < 3)
-    thor (1.3.1)
+    thor (1.3.2)
    thread_safe (0.3.6)
-    tilt (2.3.0)
+    tilt (2.6.0)
    timecop (0.9.10)
-    timeout (0.4.1)
+    timeout (0.4.3)
    trollop (1.16.2)
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
    unicorn (6.1.0)
      kgio (~> 2.6)
      raindrops (~> 0.7)
    uniform_notifier (1.16.0)
-    uri (0.13.0)
+    uri (1.0.3)
+    useragent (0.16.11)
    validate_url (1.0.15)
      activemodel (>= 3.0.0)
      public_suffix
-    vcr (6.2.0)
+    vcr (6.3.1)
+      base64
    virtus (2.0.0)
      axiom-types (~> 0.1)
      coercible (~> 1.0)
@@ -667,8 +703,8 @@ GEM
      nokogiri (>= 1.2.0)
      rack (>= 1.0)
      rack-test (>= 0.5.3)
-    webrick (1.8.1)
-    websocket (1.2.10)
+    webrick (1.9.1)
+    websocket (1.2.11)
    websocket-driver (0.7.6)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
@@ -679,7 +715,7 @@ GEM
      webrick
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.6.16)
+    zeitwerk (2.7.2)

 PLATFORMS
  ruby
@@ -698,7 +734,7 @@ DEPENDENCIES
  bootstrap-datepicker-rails
  bootstrap_form (>= 4.5.0)
  bullet
-  bundler (>= 2.3.10)
+  bundler (>= 2.4.22)
  byebug
  cancancan
  capybara
@@ -757,7 +793,7 @@ DEPENDENCIES
  query_diet
  rack-cors
  rack-protection (>= 2.0.1)
-  rails (~> 7.1.0)
+  rails (~> 7.2.0)
  rails-assets-leaflet.markercluster!
  rails-controller-testing
  rails_12factor
@@ -771,8 +807,12 @@ DEPENDENCIES
  rswag-specs
  rswag-ui
  rubocop
+  rubocop-capybara
+  rubocop-factory_bot
  rubocop-rails
+  rubocop-rake
  rubocop-rspec
+  rubocop-rspec_rails
  ruby-units
  sassc-rails
  scout_apm
@@ -791,7 +831,7 @@ DEPENDENCIES
  xmlrpc

 RUBY VERSION
-   ruby 3.1.4p223
+   ruby 3.3.4p94

 BUNDLED WITH
-   2.3.11
+   2.4.22
--- a/app/assets/javascripts/likes.js
+++ b/app/assets/javascripts/likes.js
@@ -1,11 +1,19 @@
 $(document).ready(function() {
  $('.like-btn').show();

-  $('.post-like').on('ajax:success', function(event, data) {
-    var likeButton = $('#post-' + data.id + ' .post-like');
-    var likeBadge = $('#post-'+ data.id + ' .like-badge');
+  /**
+   * 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-' + data.id + ' .like-count').text(data.like_count);
+    $(target + ' .like-count').text(data.like_count);
    if (data.liked_by_member) {
      likeBadge.addClass('liked');
      likeButton.data('method', 'delete');
@@ -14,11 +22,26 @@ $(document).ready(function() {
    } else {
      likeBadge.removeClass('liked');
      likeButton.data('method', 'post');
-      likeButton.attr('href', '/likes.json?type=Post&id=' + data.id);
+      likeButton.attr('href', '/likes.json?type=' + objectClass + '&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');
--- a/app/assets/stylesheets/_plantings.scss
+++ b/app/assets/stylesheets/_plantings.scss
@@ -47,4 +47,13 @@
      margin-left: auto;
    }
  }
+
+  .card-footer {
+    max-height: 2em;
+    -webkit-line-clamp: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin-bottom: 0.5em;
+    padding-top: 0;
+  }
 }
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -8,6 +8,9 @@ body {
  font-family: $default-font;
 }

+.navbar {
+  flex-wrap: nowrap;
+}
 .navbar-brand {
  .site-name {
    font-family: "Modak", cursive;
@@ -16,7 +19,7 @@ body {
  }

  img {
-    height: 60px;
+    height: 100%;
  }
 }

--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -29,7 +29,8 @@ class ActivitiesController < DataController

  def new
    @activity = Activity.new(
-      owner: current_member
+      owner: current_member,
+      due_date: Date.today
    )
    if params[:garden_id]
      @activity.garden = Garden.find_by(
@@ -81,8 +82,8 @@ class ActivitiesController < DataController
  end

  def specifics
-    if @owner.present?
-      "#{@owner.to_param}-"
-    end
+    return if @owner.blank?
+
+    "#{@owner.to_param}-"
  end
 end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,9 +3,7 @@
 class ApplicationController < ActionController::Base
  protect_from_forgery
  # Working from codespaces, we want to turn off validation
-  if Rails.env.development? && ENV['CODESPACE_NAME']
-    skip_before_action :verify_authenticity_token
-  end
+  skip_before_action :verify_authenticity_token if Rails.env.development? && ENV['CODESPACE_NAME']

  include ApplicationHelper

--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -81,7 +81,7 @@ class CropsController < ApplicationController
        @companions = @crop.companions.approved
      end
      format.svg do
-        icon_data = @crop.svg_icon.presence || File.read(Rails.root.join('app', 'assets', 'images', 'icons', 'sprout.svg'))
+        icon_data = @crop.svg_icon.presence || File.read(Rails.root.join("app/assets/images/icons/sprout.svg"))
        send_data(icon_data, type: "image/svg+xml", disposition: "inline")
      end
      format.json do
@@ -113,7 +113,12 @@ class CropsController < ApplicationController
      @crop.approval_status = "pending"
    end

-    notify_wranglers if Crop.transaction { @crop.save && save_crop_names }
+    if Crop.transaction { @crop.save && save_crop_names }
+      notify_wranglers
+    else
+      @crop.alternate_names.build
+      @crop.scientific_names.build
+    end

    respond_with @crop
  end
--- a/app/controllers/garden_collaborators_controller.rb
+++ b/app/controllers/garden_collaborators_controller.rb
@@ -0,0 +1,87 @@
+# 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
--- a/app/controllers/gardens_controller.rb
+++ b/app/controllers/gardens_controller.rb
@@ -8,7 +8,10 @@ class GardensController < DataController

    @gardens = @gardens.includes(:owner)
    @gardens = @gardens.active unless @show_all
-    @gardens = @gardens.where(owner: @owner) if @owner.present?
+    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.not(members: { confirmed_at: nil })
      .order(:name).paginate(page: params[:page])
    respond_with(@gardens)
--- a/app/controllers/likes_controller.rb
+++ b/app/controllers/likes_controller.rb
@@ -58,7 +58,7 @@ class LikesController < ApplicationController

  def failed(like, message)
    respond_to do |format|
-      format.json { render(json: { 'error': message }, status: :forbidden) }
+      format.json { render(json: { error: message }, status: :forbidden) }
      format.html do
        flash[:error] = message
        if like&.likeable
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -61,7 +61,7 @@ class MembersController < ApplicationController
  end

  def unsubscribe
-    verifier = ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
+    verifier = ActiveSupport::MessageVerifier.new(ENV.fetch('RAILS_SECRET_TOKEN', nil))
    decrypted_message = verifier.verify(params[:message])

    @member = Member.find(decrypted_message[:member_id])
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -21,7 +21,7 @@ class MessagesController < ApplicationController
    return if params[:recipient_id].blank?

    @recipient = Member.find_by(id: params[:recipient_id])
-    return if @recipient.nil?
+    nil if @recipient.nil?
  end

  def create
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/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(resource)
+      super
    else
      finish_signup_path(resource)
    end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -28,12 +28,6 @@ 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)
--- a/app/helpers/auto_suggest_helper.rb
+++ b/app/helpers/auto_suggest_helper.rb
@@ -13,7 +13,7 @@ module AutoSuggestHelper
    resource = resource.class.name.downcase
    source_path = Rails.application.routes.url_helpers.send("search_#{source}s_path", format: :json)
    %(
-      <input id="#{source}" class="auto-suggest #{options[:class]}"
+      <input id="#{source}" class="auto-suggest #{options[:class]}" #{options[:required] ? 'required="required"' : ''}
        type="text" value="#{default}" data-source-url="#{source_path}",
        placeholder="e.g. lettuce">
      <noscript class="text-warning">
--- a/app/helpers/crops_helper.rb
+++ b/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 #{total_quantity} #{Seed.model_name.human(count: total_quantity)} of this crop."
-    else
+    if total_quantity == 0
      "You have an unknown quantity of seeds of this crop."
+    else
+      "You have #{total_quantity} #{Seed.model_name.human(count: total_quantity)} of this crop."
    end
  end

  def crop_ebay_seeds_url(crop)
-    "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"
+    "https://www.ebay.com/sch/i.html?_nkw=#{CGI.escape crop.name}"
  end
 end
--- a/app/mailers/notifier_mailer.rb
+++ b/app/mailers/notifier_mailer.rb
@@ -2,15 +2,15 @@

 class NotifierMailer < ApplicationMailer
  # include NotificationsHelper
-  default from: "Growstuff <#{ENV['GROWSTUFF_EMAIL']}>"
+  default from: "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"

  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['RAILS_SECRET_TOKEN'])
+    ActiveSupport::MessageVerifier.new(ENV.fetch('RAILS_SECRET_TOKEN', nil))
  end

  def notify(notification)
@@ -27,7 +27,7 @@ class NotifierMailer < ApplicationMailer

  def planting_reminder(member)
    @member = member
-    @sitename = ENV['GROWSTUFF_SITE_NAME']
+    @sitename = ENV.fetch('GROWSTUFF_SITE_NAME', nil)

    @late = []
    @super_late = []
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -108,16 +108,38 @@ 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
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -5,6 +5,7 @@ class Activity < ApplicationRecord
  include Ownable
  include Finishable
  include SearchActivities
+  include Likeable

  belongs_to :garden, optional: true
  belongs_to :planting, optional: true
--- a/app/models/concerns/member_flickr.rb
+++ b/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['GROWSTUFF_FLICKR_KEY']
-          FlickRaw.shared_secret = ENV['GROWSTUFF_FLICKR_SECRET']
+          FlickRaw.api_key = ENV.fetch('GROWSTUFF_FLICKR_KEY', nil)
+          FlickRaw.shared_secret = ENV.fetch('GROWSTUFF_FLICKR_SECRET', nil)
          @flickr = FlickRaw::Flickr.new
          @flickr.access_token = flickr_auth.token
          @flickr.access_secret = flickr_auth.secret
--- a/app/models/concerns/search_activities.rb
+++ b/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,
--- a/app/models/concerns/search_plantings.rb
+++ b/app/models/concerns/search_plantings.rb
@@ -30,7 +30,8 @@ module SearchPlantings
        quantity:,
        sunniness:,
        garden_id:,
-        garden_name: garden&.name,
+        garden_slug:                garden&.garden_slug,
+        garden_name:                garden&.name,
        description:,

        first_harvest_predicted_at:,
--- a/app/models/csv_importer.rb
+++ b/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: name, crop: @crop, creator: cropbot
+      altname ||= AlternateName.create! name:, crop: @crop, creator: cropbot
      @crop.alternate_names << altname
    end
  end
--- a/app/models/follow.rb
+++ b/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['GROWSTUFF_SITE_NAME']}. "
+      body:         "#{follower.login_name} just followed you on #{ENV.fetch('GROWSTUFF_SITE_NAME', nil)}. "
    )
  end
 end
--- a/app/models/garden.rb
+++ b/app/models/garden.rb
@@ -10,6 +10,7 @@ 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

--- a/app/models/garden_collaborator.rb
+++ b/app/models/garden_collaborator.rb
@@ -0,0 +1,24 @@
+# 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
--- a/app/models/harvest.rb
+++ b/app/models/harvest.rb
@@ -6,6 +6,7 @@ class Harvest < ApplicationRecord
  include PhotoCapable
  include Ownable
  include SearchHarvests
+  include Likeable

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

@@ -151,7 +152,10 @@ class Harvest < ApplicationRecord
  def owner_must_match_planting
    return if planting.blank? # only check if we are linked to a planting

-    errors.add(:owner, "of harvest must be the same as planting") unless owner == planting.owner
+    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")
  end

  def harvest_must_be_after_planting
--- a/app/models/planting.rb
+++ b/app/models/planting.rb
@@ -8,6 +8,7 @@ class Planting < ApplicationRecord
  include PredictPlanting
  include PredictHarvest
  include SearchPlantings
+  include Likeable

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

@@ -60,6 +61,7 @@ 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
@@ -126,6 +128,9 @@ class Planting < ApplicationRecord
  end

  def owner_must_match_garden_owner
-    errors.add(:owner, "must be the same as garden") unless owner == 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")
  end
 end
--- a/app/models/seed.rb
+++ b/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) }

--- a/app/views/activities/_actions.haml
+++ b/app/views/activities/_actions.haml
@@ -1,5 +1,5 @@
 - if can?(:edit, activity)
-  .dropdown.activity-actions
+  %span.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')
--- a/app/views/activities/_form.html.haml
+++ b/app/views/activities/_form.html.haml
@@ -6,7 +6,6 @@
        %strong=yield :title
  = bootstrap_form_for(@activity) do |f|
    .card-body
-      = required_field_help_text
      - if @activity.errors.any?
        #error_explanation
          %h2
@@ -40,9 +39,9 @@
          = link_to "Add a planting.", new_planting_path

        .col-md-4
-          = f.text_field :due_date,
+          = f.date_field :due_date,
                     value: @activity.due_date ? @activity.due_date.to_fs(:ymd) : '',
-                     class: 'add-datepicker', label: 'When?'
+                     label: 'When?'

      %hr

--- a/app/views/activities/show.html.haml
+++ b/app/views/activities/show.html.haml
@@ -22,19 +22,17 @@
            %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
@@ -48,4 +46,3 @@


    .col-md-4.col-xs-12
-      = render 'activities/actions', activity: @activity
--- a/app/views/crops/_form.html.haml
+++ b/app/views/crops/_form.html.haml
@@ -26,7 +26,7 @@
      %h2 Basic information

      .form-group#new_crop
-      = f.text_field :name
+      = f.text_field :name, required: true
      %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.text_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
+      = f.url_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
      %span.help-block
        Link to the crop's page on the English language Wikipedia (required).

--- a/app/views/garden_collaborators/_form.html.haml
+++ b/app/views/garden_collaborators/_form.html.haml
@@ -0,0 +1,18 @@
+.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'
--- a/app/views/garden_collaborators/edit.html.haml
+++ b/app/views/garden_collaborators/edit.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, "Edit garden collaborator"
+
+= render 'form'
--- a/app/views/garden_collaborators/index.html.haml
+++ b/app/views/garden_collaborators/index.html.haml
@@ -0,0 +1,72 @@
+- 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
--- a/app/views/garden_collaborators/new.html.haml
+++ b/app/views/garden_collaborators/new.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, "New garden collaborator"
+
+= render 'form'
--- a/app/views/garden_collaborators/show.html.haml
+++ b/app/views/garden_collaborators/show.html.haml
--- a/app/views/gardens/_form.html.haml
+++ b/app/views/gardens/_form.html.haml
@@ -5,7 +5,6 @@
        %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
@@ -16,7 +15,7 @@
              %li= msg

      = f.text_field :name, maxlength: 255, required: true
-      = f.text_area :description, rows: 6
+      = 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_field :location,
                      value: @garden.location || current_member.location,
                      class: 'form-control', maxlength: 255
@@ -27,7 +26,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"
+        .col-md-5.col-12= f.number_field :area, class: 'input-small', step: "any", min: 0
        .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)
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -31,7 +31,7 @@
      %p
        :markdown
          #{strip_tags markdownify(@garden.description)}
-        - unless @garden.description
+        - unless @garden.description.present?
          .row-fluid
            %p No description available yet.

@@ -39,8 +39,13 @@
              %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.where.not(planted_at: nil).any?
+    - if @garden.plantings.active.any?
      %section.card
        %h2 Garden progress
        .card-body
@@ -55,6 +60,14 @@
        - 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
@@ -65,6 +78,9 @@
        - 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
@@ -83,6 +99,17 @@
        %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:
--- a/app/views/harvests/_actions.html.haml
+++ b/app/views/harvests/_actions.html.haml
@@ -1,5 +1,5 @@
 - if can?(:edit, harvest)
-  .dropdown.harvest-actions
+  %span.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')
--- a/app/views/harvests/_form.html.haml
+++ b/app/views/harvests/_form.html.haml
@@ -7,7 +7,6 @@
          = 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:"
@@ -31,8 +30,7 @@
                = link_to "Request new crops.", new_crop_path

        .col-md-4
-          = f.text_field :harvested_at, value: @harvest.harvested_at ? @harvest.harvested_at.to_fs(:ymd) : '',
-                         class: 'add-datepicker', label: 'When?'
+          = f.date_field :harvested_at, value: @harvest.harvested_at ? @harvest.harvested_at.to_fs(:ymd) : '', label: 'When?'
        .col-12
          = f.form_group :plant_part_id, label: { text: "Harvested Plant Part" } do
            .row
@@ -44,7 +42,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?'
+          = f.number_field :quantity, class: 'input-small form-control', step: 'any', label: 'How many?', min: 1
        .col-md-8
          = f.select(:unit, Harvest::UNITS_VALUES, { include_blank: false }, class: 'input-medium form-control')
      .row
--- a/app/views/harvests/show.html.haml
+++ b/app/views/harvests/show.html.haml
@@ -15,13 +15,26 @@
 .harvest
  .row
    .col-md-8.col-xs-12
-      %h1
-        = harvest_icon
-        #{@harvest.crop} harvested by #{@harvest.owner}
-    .col-md-4.col-xs-12
-      = render 'harvests/actions', harvest: @harvest
-    .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
+
+    .col-md-4.col-xs-12
+      = render 'harvests/owner', harvest: @harvest
+    .col-md-8.col-xs-12
      .index-cards.facts
        - if @harvest.plant_part
          .card
@@ -53,14 +66,5 @@
          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
--- a/app/views/likes/_count.haml
+++ b/app/views/likes/_count.haml
@@ -1,4 +1,4 @@
 %span.badge.like-badge{class: liked ? 'liked' : ''}
  = like_icon
  &nbsp;
-  %span.like-count= likeable.likes_count
+  %span.like-count{title: t('buttons.total_likes')}= likeable.likes_count
--- a/app/views/likes/_likes.html.haml
+++ b/app/views/likes/_likes.html.haml
@@ -0,0 +1,18 @@
+%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)
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -35,7 +35,7 @@
        - if @member.last_sign_in_at
          %p
            %strong Last Login
-            = @member.last_sign_in_at
+            = @member.last_sign_in_at&.to_fs(:default)

        - if can? :update, @member
          = link_to edit_member_registration_path, class: 'btn btn-block' do
--- a/app/views/photos/_actions.html.haml
+++ b/app/views/photos/_actions.html.haml
@@ -1,7 +1,7 @@
 - if can?(:edit, @photo) && can?(:destroy, @photo)
  .dropdown.float-right.photo-actions
-    %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"}
+    %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"}
      = edit_button(edit_photo_path(@photo), classes: 'dropdown-item')
      .dropdown-divider
      = delete_button(@photo, classes: 'dropdown-item text-danger')
--- a/app/views/photos/_associations.html.haml
+++ b/app/views/photos/_associations.html.haml
@@ -30,3 +30,9 @@
          = 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
--- a/app/views/photos/show.html.haml
+++ b/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}

--- a/app/views/plantings/_actions.html.haml
+++ b/app/views/plantings/_actions.html.haml
@@ -1,5 +1,5 @@
 - if can?(:edit, planting)
-  .dropdown.planting-actions
+  %span.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')
--- a/app/views/plantings/_card.html.haml
+++ b/app/views/plantings/_card.html.haml
@@ -31,7 +31,10 @@
        .text-center= render 'plantings/badges', planting: planting
        = render 'plantings/progress', planting: planting
    .card-footer
-      .float-right
-        %span.chip.member-chip
-          = link_to member_path(slug: planting.owner_slug) do
-            = planting.owner_login_name
+      %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
--- a/app/views/plantings/_form.html.haml
+++ b/app/views/plantings/_form.html.haml
@@ -6,7 +6,6 @@
        %strong=yield :title
  = bootstrap_form_for(@planting) do |f|
    .card-body
-      = required_field_help_text
      - if @planting.errors.any?
        #error_explanation
          %h2
@@ -45,7 +44,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?'
+          = f.number_field :quantity, label: 'How many?', min: 1
      = f.text_area :description, rows: 6, label: 'Tell us more about it'

      .row
--- a/app/views/plantings/show.html.haml
+++ b/app/views/plantings/show.html.haml
@@ -43,6 +43,8 @@
                  %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
@@ -79,8 +81,6 @@


    .col-md-4.col-xs-12
-      = render 'plantings/actions', planting: @planting
-      %hr/
      = render @planting.crop

      - if @planting.location
--- a/app/views/posts/_likes.html.haml
+++ b/app/views/posts/_likes.html.haml
@@ -1,10 +0,0 @@
-
- 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)
--- a/app/views/posts/_single.html.haml
+++ b/app/views/posts/_single.html.haml
@@ -8,10 +8,10 @@
    in
    = link_to @post.forum, @post.forum
  on
-  = @post.created_at
+  = @post.created_at.to_fs(:default)
  - if @post.updated_at > @post.created_at
    and edited at
-    = @post.updated_at
+    = @post.updated_at.to_fs(:default)

 = link_to "Permalink", post

--- a/app/views/posts/show.html.haml
+++ b/app/views/posts/show.html.haml
@@ -45,7 +45,7 @@
            = render 'photos/thumbnail', photo: photo

      .card-footer
-        = render 'posts/likes', post: @post
+        = render 'likes/likes', object: @post
        .float-right
          - if can? :create, Comment
            = link_to new_comment_path(post_id: @post.id), class: 'btn' do
--- a/app/views/seeds/_form.html.haml
+++ b/app/views/seeds/_form.html.haml
@@ -14,7 +14,6 @@
          %ul
            - @seed.errors.full_messages.each do |msg|
              %li= msg
-      = required_field_help_text

      .form-group.required
        = f.label :crop, 'Crop'
@@ -23,7 +22,7 @@
          = f.hidden_field :parent_planting_id, value: @planting.id
        - else

-          = auto_suggest @seed, :crop, class: 'form-control', default: @crop
+          = auto_suggest @seed, :crop, class: 'form-control', default: @crop, required: true
          %span.help-inline
            Can't find what you're looking for?
            = link_to "Request new crops.", new_crop_path
@@ -32,7 +31,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'
+        .col-12.col-md-4= f.number_field :quantity, label: 'Quantity', min: 1
        .col-12.col-md-4
          = f.text_field :plant_before, class: 'add-datepicker',
          value: @seed.plant_before ? @seed.plant_before.to_fs(:ymd) : ''
@@ -46,21 +45,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'
-        .col-md-6= f.number_field :days_until_maturity_max, label_as_placeholder: true, label: 'max', prepend: 'to', append: "days"
+        .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

      .row
        .col-md-4
-          = f.select(:organic, Seed::ORGANIC_VALUES, {label: 'Organic?', wrapper: { class: 'required'}}, default: 'unknown', required: true)
+          = f.select(:organic, Seed::ORGANIC_VALUES, {label: 'Organic?', wrapper: { class: 'required'}, required: true}, default: 'unknown')
        .col-md-4
-          = f.select(:gmo, Seed::GMO_VALUES, {label: 'GMO?', wrapper: { class: 'required'}}, default: 'unknown', required: true)
+          = f.select(:gmo, Seed::GMO_VALUES, {label: 'GMO?', wrapper: { class: 'required'}, required: true}, default: 'unknown')
        .col-md-4
-          = f.select(:heirloom, Seed::HEIRLOOM_VALUES, {label: 'Heirloom?', wrapper: { class: 'required'}}, default: 'unknown', required: true)
+          = f.select(:heirloom, Seed::HEIRLOOM_VALUES, {label: 'Heirloom?', wrapper: { class: 'required'}, required: true}, default: 'unknown')
      = 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'}})
+      = f.select(:tradable_to, Seed::TRADABLE_TO_VALUES, {label: 'Will trade', wrapper: { class: 'required'}, required: true})
      %span.help_inline
        - if current_member.location.blank?
          Don't forget to
--- a/app/views/shared/editable/_date.html.haml
+++ b/app/views/shared/editable/_date.html.haml
@@ -5,7 +5,6 @@
      = edit_icon
  .hide{id: "date--#{model.id}-#{field.to_s}"}
    = bootstrap_form_for(model) do |f|
-      = f.text_field field,
-               value: model.send(field) ? model.send(field).to_fs(:ymd) : '',
-               class: 'add-datepicker', label: 'When?'
+      = f.date_field field,
+               value: model.send(field) ? model.send(field).to_fs(:ymd) : '', label: 'When?'
      = f.submit :save
--- a/app/views/shared/editable/_form.html.haml
+++ b/app/views/shared/editable/_form.html.haml
@@ -12,7 +12,6 @@
      - elsif field_type == :select
        = f.select field, collection
      - elsif field_type == :date
-        = f.text_field field,
-                 value: model.send(field) ? model.send(field).to_fs(:ymd) : '',
-                 class: 'add-datepicker', label: 'When?'
+        = f.date_field field,
+                 value: model.send(field) ? model.send(field).to_fs(:ymd) : '', label: 'When?'
      = f.submit :save
--- a/app/views/timeline/_photos.html.haml
+++ b/app/views/timeline/_photos.html.haml
@@ -24,4 +24,9 @@
        - 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)
+            = 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)
--- a/bin/setup
+++ b/bin/setup
@@ -23,12 +23,8 @@ FileUtils.chdir APP_ROOT do
  system('bin/yarn')

  puts "\n== Copying sample files =="
-  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
+  FileUtils.cp 'config/database.yml.example', 'config/database.yml' unless File.exist?('config/database.yml')
+  FileUtils.cp 'env-example', '.env' unless File.exist?('.env')

  puts "\n== Checking for elastic search =="
  system! 'script/check_elasticsearch.sh'
--- a/config.ru
+++ b/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
--- a/config/application.rb
+++ b/config/application.rb
@@ -26,7 +26,7 @@ module Growstuff
    config.active_record.yaml_column_permitted_classes = [Symbol, Date, Time, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone]

    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    I18n.load_path += Dir[Rails.root.join('config', 'locales', '*.{rb,yml}')]
+    I18n.load_path += Dir[Rails.root.join("config/locales/*.{rb,yml}")]
    I18n.default_locale = :en
    # rails will fallback to config.i18n.default_locale translation
    config.i18n.fallbacks = true
@@ -62,7 +62,7 @@ module Growstuff

    # Growstuff-specific configuration variables
    config.currency = 'AUD'
-    config.bot_email = ENV['GROWSTUFF_EMAIL']
+    config.bot_email = ENV.fetch('GROWSTUFF_EMAIL', nil)
    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['GROWSTUFF_MAILCHIMP_NEWSLETTER_ID']
+    config.newsletter_list_id = ENV.fetch('GROWSTUFF_MAILCHIMP_NEWSLETTER_ID', nil)

    # config.active_record.raise_in_transactional_callbacks = true
    config.middleware.insert_before 0, Rack::Cors do
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -16,7 +16,7 @@ Rails.application.configure do

  # Enable/disable caching. By default caching is disabled.
  # Run rails dev:cache to toggle caching.
-  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+  if Rails.root.join("tmp/caching-dev.txt").exist?
    config.action_controller.perform_caching = true

    config.cache_store = :memory_store
--- a/config/environments/production.rb
+++ b/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["MEMCACHIER_USERNAME"],
-                         password:             ENV["MEMCACHIER_PASSWORD"],
+                       { username:             ENV.fetch("MEMCACHIER_USERNAME", nil),
+                         password:             ENV.fetch("MEMCACHIER_PASSWORD", nil),
                         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['HOST'] }
+  config.action_mailer.default_url_options = { host: ENV.fetch('HOST', nil) }

  config.action_mailer.smtp_settings = {
-    user_name:            ENV['MAILGUN_SMTP_LOGIN'],
-    password:             ENV['MAILGUN_SMTP_PASSWORD'],
-    domain:               ENV['GROWSTUFF_EMAIL_DOMAIN'],
-    address:              ENV['MAILGUN_SMTP_SERVER'],
+    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),
    port:                 587,
    authentication:       :plain,
    enable_starttls_auto: true
  }
  ActionMailer::Base.delivery_method = :smtp

-  config.host = ENV['HOST']
+  config.host = ENV.fetch('HOST', nil)
  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>
--- a/config/factory_bot.rb
+++ b/config/factory_bot.rb
@@ -2,7 +2,7 @@

 ActionDispatch::Callbacks.after do
  # Reload the factories
-  return unless Rails.env.development? || Rails.env.test?
+  return unless Rails.env.local?

  if FactoryBot.factories.present? # first init will load factories, this should only run on subsequent reloads
    FactoryBot.factories.clear
--- a/config/initializers/application_controller_renderer.rb
+++ b/config/initializers/application_controller_renderer.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.

 # ActiveSupport::Reloader.to_prepare do
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.

 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.

 # Define an application-wide content security policy
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -6,9 +6,9 @@ Devise.setup do |config|
  # ==> Mailer Configuration
  # Configure the e-mail address which will be shown in Devise::Mailer,
  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "Growstuff <#{ENV['GROWSTUFF_EMAIL']}>"
+  config.mailer_sender = "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"

-  config.secret_key = ENV['RAILS_SECRET_TOKEN']
+  config.secret_key = ENV.fetch('RAILS_SECRET_TOKEN', nil)

  # Configure the class responsible to send e-mails.
  # config.mailer = "Devise::Mailer"
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.

 # Add new mime types for use in respond_to blocks:
--- a/config/initializers/new_framework_defaults_5_2.rb
+++ b/config/initializers/new_framework_defaults_5_2.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 #
 # This file contains migration options to ease your Rails 5.2 upgrade.
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true

 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :twitter, ENV['GROWSTUFF_TWITTER_KEY'], ENV['GROWSTUFF_TWITTER_SECRET']
-  provider :flickr, ENV['GROWSTUFF_FLICKR_KEY'], ENV['GROWSTUFF_FLICKR_SECRET'], scope: 'read'
+  provider :twitter, ENV.fetch('GROWSTUFF_TWITTER_KEY', nil), ENV.fetch('GROWSTUFF_TWITTER_SECRET', nil)
+  provider :flickr, ENV.fetch('GROWSTUFF_FLICKR_KEY', nil), ENV.fetch('GROWSTUFF_FLICKR_SECRET', nil), scope: 'read'
 end
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -92,6 +92,9 @@ en:
    save_seeds: Save seeds
    timeline: Timeline
    write_blog_post: Write blog post
+    like: Like
+    unlike: Remove like
+    total_likes: Total likes
  crops:
    search: Search crops
    index:
@@ -267,6 +270,7 @@ en:
      planting: "%{planting}"
      seed: "%{seed}"
      thing_by: A %{thing} by %{owner}
+      crop: "%{crop}"
  places:
    index:
      title: "%{site_name} Community Map"
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -30,6 +30,8 @@ Rails.application.routes.draw do

  resources :gardens, concerns: :has_photos, param: :slug do
    get 'timeline' => 'charts/gardens#timeline', constraints: { format: 'json' }
+
+    resources :garden_collaborators
  end

  resources :plantings, concerns: :has_photos, param: :slug do
--- a/db/migrate/20150201052245_create_cms.rb
+++ b/db/migrate/20150201052245_create_cms.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true

 class CreateCms < ActiveRecord::Migration[4.2]
-  def self.up # rubocop:disable Metrics/MethodLength
+  def self.up
    # -- Sites --------------------------------------------------------------
    create_table :comfy_cms_sites do |t|
      t.string :label,        null: false
--- a/db/migrate/20171129041341_create_photographings.rb
+++ b/db/migrate/20171129041341_create_photographings.rb
@@ -37,18 +37,22 @@ class CreatePhotographings < ActiveRecord::Migration[4.2]
      Photographing.create! photo_id: s.photo_id, photographable_id: s.seed_id, photographable_type: 'Seed'
    end
  end
+
  class GardensPhoto < ApplicationRecord
    belongs_to :photo
    belongs_to :garden
  end
+
  class PhotosPlanting < ApplicationRecord
    belongs_to :photo
    belongs_to :planting
  end
+
  class HarvestsPhoto < ApplicationRecord
    belongs_to :photo
    belongs_to :harvest
  end
+
  class PhotosSeed < ApplicationRecord
    belongs_to :photo
    belongs_to :seed
--- a/db/migrate/20190130090437_add_crop_to_photographings.rb
+++ b/db/migrate/20190130090437_add_crop_to_photographings.rb
@@ -9,6 +9,7 @@ class AddCropToPhotographings < ActiveRecord::Migration[5.2]
      p.set_crop && p.save!
    end
  end
+
  class Photographing < ApplicationRecord
    belongs_to :photo, inverse_of: :photo_associations
    belongs_to :photographable, polymorphic: true
--- a/db/migrate/20191119030244_cms_tags.rb
+++ b/db/migrate/20191119030244_cms_tags.rb
@@ -28,10 +28,10 @@ class CmsTags < ActiveRecord::Migration[5.2]
        layout.content = layout.content.gsub(%r{\{\{ ?cms:(\w+):([\w/-]+):([\w/-]+):([\w/-]+) ?\}\}}, '{{ cms:\1 \2 \3 \4}}')
      end
      layout.content = layout.content.gsub(/\{\{ ?cms:(\w+):(\w+):([^:]*) ?}}/, '{{ cms:\1 \2, "\3" }}') if layout.content.is_a? String
-      layout.content = layout.content.gsub(/cms:rich_text/, 'cms:wysiwyg') if layout.content.is_a? String
-      layout.content = layout.content.gsub(/cms:integer/, 'cms:number') if layout.content.is_a? String
+      layout.content = layout.content.gsub("cms:rich_text", 'cms:wysiwyg') if layout.content.is_a? String
+      layout.content = layout.content.gsub("cms:integer", 'cms:number') if layout.content.is_a? String
      if layout.content.is_a? String
-        layout.content = layout.content.gsub(/cms: string/, 'cms:text')
+        layout.content = layout.content.gsub("cms: string", 'cms:text')
      end # probably a result of goofing one of the more general regexps
      if layout.content.is_a? String
        layout.content = layout.content.gsub(%r{\{\{ ?cms:page_file ([\w/]+) ?\}\}}, '{{ cms:file \1, render: false }}')
--- a/db/migrate/20230313015323_create_active_storage_tables.active_storage.rb
+++ b/db/migrate/20230313015323_create_active_storage_tables.active_storage.rb
@@ -39,7 +39,7 @@ class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
      t.foreign_key :active_storage_blobs, column: :blob_id
    end

-    create_table :active_storage_variant_records, id: primary_key_type do |t|
+    create_table :active_storage_variant_records, id: primary_key_type do |t| # rubocop:disable Rails/CreateTableWithTimestamps
      t.belongs_to :blob, null: false, index: false, type: foreign_key_type
      t.string :variation_digest, null: false

--- a/db/migrate/20240218053122_add_slug_to_activity.rb
+++ b/db/migrate/20240218053122_add_slug_to_activity.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class AddSlugToActivity < ActiveRecord::Migration[7.1]
  def change
    add_column :activities, :slug, :string
--- a/db/migrate/20240714024918_like_everything.rb
+++ b/db/migrate/20240714024918_like_everything.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class LikeEverything < ActiveRecord::Migration[7.1]
+  def change
+    change_table :activities do |t|
+      t.integer :likes_count, default: 0
+    end
+
+    change_table :plantings do |t|
+      t.integer :likes_count, default: 0
+    end
+
+    change_table :harvests do |t|
+      t.integer :likes_count, default: 0
+    end
+  end
+end
--- a/db/migrate/20240929041435_create_garden_collaborators.rb
+++ b/db/migrate/20240929041435_create_garden_collaborators.rb
@@ -0,0 +1,10 @@
+class CreateGardenCollaborators < ActiveRecord::Migration[7.2]
+  def change
+    create_table :garden_collaborators do |t|
+      t.references :member
+      t.references :garden
+      t.timestamps
+      t.index [:member_id, :garden_id], unique: true
+    end
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
+ActiveRecord::Schema[7.2].define(version: 2024_09_29_041435) do
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"

@@ -54,6 +54,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
    t.datetime "created_at", null: false
    t.datetime "updated_at", null: false
    t.string "slug"
+    t.integer "likes_count", default: 0
    t.index ["garden_id"], name: "index_activities_on_garden_id"
    t.index ["owner_id"], name: "index_activities_on_owner_id"
    t.index ["planting_id"], name: "index_activities_on_planting_id"
@@ -265,6 +266,16 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
    t.index ["slug"], name: "index_forums_on_slug", unique: true
  end

+  create_table "garden_collaborators", force: :cascade do |t|
+    t.bigint "member_id"
+    t.bigint "garden_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["garden_id"], name: "index_garden_collaborators_on_garden_id"
+    t.index ["member_id", "garden_id"], name: "index_garden_collaborators_on_member_id_and_garden_id", unique: true
+    t.index ["member_id"], name: "index_garden_collaborators_on_member_id"
+  end
+
  create_table "garden_types", force: :cascade do |t|
    t.text "name", null: false
    t.text "slug", null: false
@@ -314,6 +325,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
    t.integer "plant_part_id"
    t.float "si_weight"
    t.integer "planting_id"
+    t.integer "likes_count", default: 0
    t.index ["planting_id"], name: "index_harvests_on_planting_id"
  end

@@ -530,6 +542,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
    t.integer "days_to_last_harvest"
    t.integer "parent_seed_id"
    t.integer "harvests_count", default: 0
+    t.integer "likes_count", default: 0
    t.index ["slug"], name: "index_plantings_on_slug", unique: true
  end

--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -26,7 +26,7 @@ def load_data
 end

 def load_crops
-  source_path = Rails.root.join('db', 'seeds')
+  source_path = Rails.root.join("db/seeds")
  Dir.glob("#{source_path}/crops*.csv").each do |crop_file|
    puts "Loading crops from #{crop_file}..."
    CSV.foreach(crop_file) do |row|
@@ -48,7 +48,7 @@ def load_test_users
  puts "Loading test users..."

  # Open suburb csv
-  source_path = Rails.root.join('db', 'seeds')
+  source_path = Rails.root.join("db/seeds")
  begin
    suburb_file = File.open("#{source_path}/suburbs.csv")
  rescue StandardError
@@ -86,7 +86,7 @@ def load_test_users
        owner_id:     @user.id,
        garden_id:    @user.gardens.first.id,
        planted_at:   (n * 7).days.ago,
-        crop_id:      Crop.find((i + n) % Crop.all.size + 1).id,
+        crop_id:      Crop.find(((i + n) % Crop.all.size) + 1).id,
        sunniness:    select_random_item(Planting::SUNNINESS_VALUES),
        planted_from: select_random_item(Planting::PLANTED_FROM_VALUES)
      )
--- a/lib/haml/filters/escaped_markdown.rb
+++ b/lib/haml/filters/escaped_markdown.rb
@@ -6,7 +6,7 @@ require 'haml/filters/growstuff_markdown'
 class Haml::Filters
  class EscapedMarkdown < Haml::Filters::Markdown
    def compile(node)
-      [:escape, true, super(node)]
+      [:escape, true, super]
    end
  end

--- a/lib/tasks/gardens.rake
+++ b/lib/tasks/gardens.rake
@@ -1,7 +1,6 @@
 # frozen_string_literal: true

 namespace :gardens do
-
  desc "Mark old gardens inactive"
  task archive: :environment do
    Planting.archive!
--- a/lib/tasks/growstuff.rake
+++ b/lib/tasks/growstuff.rake
@@ -5,20 +5,20 @@ namespace :growstuff do
  # usage: rake growstuff:admin_user name=skud

  task admin_user: :environment do
-    add_role_to_member! ENV['name'], 'Admin'
+    add_role_to_member! ENV.fetch('name', nil), 'Admin'
  end

  desc "Add a crop wrangler user, by name"
  # usage: rake growstuff:cropwrangler_user name=skud

  task cropwrangler_user: :environment do
-    add_role_to_member! ENV['name'], 'Crop Wrangler'
+    add_role_to_member! ENV.fetch('name', nil), 'Crop Wrangler'
  end

  def add_role_to_member!(login_name, role_name)
    unless login_name && role_name
-      raise "Usage: rake growstuff:[rolename] name=[username] "\
-        "\n (login name is case-sensitive)\n"
+      raise "Usage: rake growstuff:[rolename] name=[username] " \
+            "\n (login name is case-sensitive)\n"
    end
    member = Member.find_by!(login_name:)
    role = Role.find_by!(name: role_name)
@@ -31,7 +31,7 @@ namespace :growstuff do
  task import_crops: :environment do
    require 'csv'

-    (@file = ENV['file']) || raise("Usage: rake growstuff:import_crops file=file.csv")
+    (@file = ENV.fetch('file', nil)) || raise("Usage: rake growstuff:import_crops file=file.csv")

    puts "Loading crops from #{@file}..."
    CSV.foreach(@file) do |row|
--- a/script/check_contributors_md.rb
+++ b/script/check_contributors_md.rb
@@ -5,12 +5,12 @@ require "English"

 if ENV['CI']
  if ENV['GITHUB_EVENT_NAME'] == 'pull_request'
-    author = ENV['GITHUB_ACTOR']
+    author = ENV.fetch('GITHUB_ACTOR', nil)
    exit 1 unless author

  elsif ENV['TRAVIS_PULL_REQUEST']
    require 'httparty'
-    repo = ENV['TRAVIS_REPO_SLUG']
+    repo = ENV.fetch('TRAVIS_REPO_SLUG', nil)
    pr = ENV['TRAVIS_PULL_REQUEST']
    url = "https://api.github.com/repos/#{repo}/pulls/#{pr}"
    response = HTTParty.get(url).parsed_response
--- a/script/heroku_maintenance.rb
+++ b/script/heroku_maintenance.rb
@@ -4,8 +4,8 @@
 require 'platform-api'
 require 'yaml'

-heroku = PlatformAPI.connect(ENV['HEROKU_API_KEY'])
-branch = ENV['TRAVIS_BRANCH']
+heroku = PlatformAPI.connect(ENV.fetch('HEROKU_API_KEY', nil))
+branch = ENV.fetch('TRAVIS_BRANCH', nil)
 travis_config = YAML.load_file('.travis.yml')
 if travis_config['deploy']['app'].key? branch
  app = travis_config['deploy']['app'][branch]
--- a/spec/controllers/crops_controller_spec.rb
+++ b/spec/controllers/crops_controller_spec.rb
@@ -28,7 +28,7 @@ describe CropsController do
    end
  end

-  describe "GET crop hierarchy " do
+  describe "GET crop hierarchy" do
    describe 'fetches the crop hierarchy page' do
      context 'wrangler' do
        include_context 'login as wrangler'
@@ -82,8 +82,8 @@ describe CropsController do
          name:             'aubergine',
          en_wikipedia_url: "https://en.wikipedia.org/wiki/Eggplant"
        },
-        alt_name: { "1": "egg plant", "2": "purple apple" },
-        sci_name: { "1": "fancy sci name", "2": "" }
+        alt_name: { '1': "egg plant", '2': "purple apple" },
+        sci_name: { '1': "fancy sci name", '2': "" }
      }
    end

--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .1.4
 .3.4