Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Growstuff/growstuff
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: release74
Choose a base ref
...
head repository: Growstuff/growstuff
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release75
Choose a head ref
  • 11 commits
  • 5 files changed
  • 3 contributors

Commits on Sep 10, 2025

  1. Merge pull request #4243 from Growstuff/dev 

    Release71
    @CloCkWeRX
    CloCkWeRX authored Sep 10, 2025
    Configuration menu
    Copy the full SHA
    3804ae3 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2025

  1. Sept 21 release (#4258) 

    * Format

* Bump puma from 7.0.2 to 7.0.3

Bumps [puma](https://github.com/puma/puma) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](puma/puma@v7.0.2...v7.0.3)

---
updated-dependencies:
- dependency-name: puma
  dependency-version: 7.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump active_utils from 3.5.0 to 3.6.0

Bumps [active_utils](https://github.com/shopify/active_utils) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/shopify/active_utils/releases)
- [Changelog](https://github.com/Shopify/active_utils/blob/main/CHANGELOG.md)
- [Commits](Shopify/active_utils@v3.5.0...v3.6.0)

---
updated-dependencies:
- dependency-name: active_utils
  dependency-version: 3.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rexml from 3.4.1 to 3.4.2

Bumps [rexml](https://github.com/ruby/rexml) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](ruby/rexml@v3.4.1...v3.4.2)

---
updated-dependencies:
- dependency-name: rexml
  dependency-version: 3.4.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump recaptcha from 5.20.1 to 5.21.1

Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 5.20.1 to 5.21.1.
- [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md)
- [Commits](ambethia/recaptcha@v5.20.1...v5.21.1)

---
updated-dependencies:
- dependency-name: recaptcha
  dependency-version: 5.21.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Merge pull request #4222 from Growstuff/feature/add-activity-prompts

feat: Add prompts for new activities

* Add ability to copy/duplicate an activity

* Rubocop

* Rubocop fixes

* Rubocop

* Rubocop

* Rubocop

* Rubocop

* Rubocop

* Add ability to create companion plantings

This change adds the ability for crop wranglers to create and manage companion plantings for crops.

- Adds a `source_url` to the `CropCompanion` model to store an optional reference URL.
- Restricts the management of companion plantings to users with the `crop_wrangler` role.
- Creates a new admin interface for managing companion plantings for a specific crop.
- Updates the crop show page to display companions from both the crop and its parent crop.

* Merge pull request #4262 from Growstuff/feature/github-releases-widget

feat: Add cached GitHub releases widget to homepage

* Add recurring activities feature without database persistence (#4261)

* This change introduces a new feature that allows users to create recurring activities.

A user can now specify that an activity should be repeated "X" times, every "Y" weeks. When an activity is created with these options, the application will create the initial activity and then "X" additional copies, with each copy's due date offset by "Y" weeks from the previous one.

The repeat information is not stored in the database. It is only used at the time of creation to generate the recurring activities.

The following changes were made:
- Updated the new activity form to include fields for "repeat times" and "repeat weeks".
- Modified the `ActivitiesController#create` action to handle the creation of recurring activities.
- Added feature tests to ensure the new functionality works as expected.

* Remove not very useful spec

---------

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>

* Adjust copy of activities and prompts (#4260)

* Adjust copy

* Adjust copy

* Move repeat prompt

* Improve prompts

* Clean up schema

* Fix spec

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
    @CloCkWeRX @dependabot @google-labs-jules
    3 people authored Sep 21, 2025
    Configuration menu
    Copy the full SHA
    af74a29 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2025

  1. Release 73 (#4275) 

    * Bump puma from 7.0.3 to 7.0.4

Bumps [puma](https://github.com/puma/puma) from 7.0.3 to 7.0.4.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](puma/puma@v7.0.3...v7.0.4)

---
updated-dependencies:
- dependency-name: puma
  dependency-version: 7.0.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump geocoder from 1.8.5 to 1.8.6

Bumps [geocoder](https://github.com/alexreisner/geocoder) from 1.8.5 to 1.8.6.
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md)
- [Commits](alexreisner/geocoder@v1.8.5...v1.8.6)

---
updated-dependencies:
- dependency-name: geocoder
  dependency-version: 1.8.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rubocop from 1.80.2 to 1.81.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.80.2 to 1.81.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop@v1.80.2...v1.81.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-version: 1.81.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rack from 2.2.17 to 2.2.18

Bumps [rack](https://github.com/rack/rack) from 2.2.17 to 2.2.18.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](rack/rack@v2.2.17...v2.2.18)

---
updated-dependencies:
- dependency-name: rack
  dependency-version: 2.2.18
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Extend planting API to render garden id in relationships

* Update planting_resource.rb

* Update photo_resource.rb

* Update seed_resource.rb

* Update harvest_resource.rb

* Update garden_resource.rb

* Update crop_resource.rb

* Update activity_resource.rb

* Create robots.txt based on wikipedia

* Merge pull request #4274 from Growstuff/CloCkWeRX-patch-3

API > Render activities links under member

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
    @CloCkWeRX @dependabot @google-labs-jules
    3 people authored Sep 28, 2025
    Configuration menu
    Copy the full SHA
    4e91037 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2025

  1. Release 74 (#4284) 

    * Bump icalendar from 2.11.2 to 2.12.0

Bumps [icalendar](https://github.com/icalendar/icalendar) from 2.11.2 to 2.12.0.
- [Changelog](https://github.com/icalendar/icalendar/blob/main/CHANGELOG.md)
- [Commits](icalendar/icalendar@v2.11.2...v2.12.0)

---
updated-dependencies:
- dependency-name: icalendar
  dependency-version: 2.12.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rubocop from 1.81.0 to 1.81.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.81.0 to 1.81.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop@v1.81.0...v1.81.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-version: 1.81.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump haml-rails from 2.1.0 to 3.0.0

Bumps [haml-rails](https://github.com/haml/haml-rails) from 2.1.0 to 3.0.0.
- [Commits](haml/haml-rails@v2.1.0...v3.0.0)

---
updated-dependencies:
- dependency-name: haml-rails
  dependency-version: 3.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump faraday from 2.13.4 to 2.14.0

Bumps [faraday](https://github.com/lostisland/faraday) from 2.13.4 to 2.14.0.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](lostisland/faraday@v2.13.4...v2.14.0)

---
updated-dependencies:
- dependency-name: faraday
  dependency-version: 2.14.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rubocop-rails from 2.33.3 to 2.33.4

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.33.3 to 2.33.4.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop-rails@v2.33.3...v2.33.4)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-version: 2.33.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Merge pull request #4277 from Growstuff/add-activity-update-coverage

Add test coverage for updating an activity via the API

* Bump rack from 2.2.18 to 2.2.19

Bumps [rack](https://github.com/rack/rack) from 2.2.18 to 2.2.19.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](rack/rack@v2.2.18...v2.2.19)

---
updated-dependencies:
- dependency-name: rack
  dependency-version: 2.2.19
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump active_record_union from 1.3.0 to 1.4.0

Bumps [active_record_union](https://github.com/brianhempel/active_record_union) from 1.3.0 to 1.4.0.
- [Commits](https://github.com/brianhempel/active_record_union/commits)

---
updated-dependencies:
- dependency-name: active_record_union
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump selenium-webdriver from 4.35.0 to 4.36.0

Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 4.35.0 to 4.36.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES)
- [Commits](SeleniumHQ/selenium@selenium-4.35.0...selenium-4.36.0)

---
updated-dependencies:
- dependency-name: selenium-webdriver
  dependency-version: 4.36.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rack from 2.2.19 to 2.2.20

Bumps [rack](https://github.com/rack/rack) from 2.2.19 to 2.2.20.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](rack/rack@v2.2.19...v2.2.20)

---
updated-dependencies:
- dependency-name: rack
  dependency-version: 2.2.20
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump icalendar from 2.12.0 to 2.12.1

Bumps [icalendar](https://github.com/icalendar/icalendar) from 2.12.0 to 2.12.1.
- [Changelog](https://github.com/icalendar/icalendar/blob/main/CHANGELOG.md)
- [Commits](icalendar/icalendar@v2.12.0...v2.12.1)

---
updated-dependencies:
- dependency-name: icalendar
  dependency-version: 2.12.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump puma from 7.0.4 to 7.1.0

Bumps [puma](https://github.com/puma/puma) from 7.0.4 to 7.1.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/main/History.md)
- [Commits](puma/puma@v7.0.4...v7.1.0)

---
updated-dependencies:
- dependency-name: puma
  dependency-version: 7.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump chartkick from 5.2.0 to 5.2.1

Bumps [chartkick](https://github.com/ankane/chartkick) from 5.2.0 to 5.2.1.
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](ankane/chartkick@v5.2.0...v5.2.1)

---
updated-dependencies:
- dependency-name: chartkick
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rubocop from 1.81.1 to 1.81.6

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.81.1 to 1.81.6.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop@v1.81.1...v1.81.6)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-version: 1.81.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump jquery-rails from 4.6.0 to 4.6.1

Bumps [jquery-rails](https://github.com/rails/jquery-rails) from 4.6.0 to 4.6.1.
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md)
- [Commits](rails/jquery-rails@v4.6.0...v4.6.1)

---
updated-dependencies:
- dependency-name: jquery-rails
  dependency-version: 4.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump actions/upload-artifact from 4 to 5

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 5.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v4...v5)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump haml from 6.3.0 to 7.0.0

Bumps [haml](https://haml.info) from 6.3.0 to 7.0.0.

---
updated-dependencies:
- dependency-name: haml
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump selenium-webdriver from 4.36.0 to 4.38.0

Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 4.36.0 to 4.38.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES)
- [Commits](SeleniumHQ/selenium@selenium-4.36.0...selenium-4.38.0)

---
updated-dependencies:
- dependency-name: selenium-webdriver
  dependency-version: 4.38.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump haml_lint from 0.66.0 to 0.67.0

Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.66.0 to 0.67.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md)
- [Commits](sds/haml-lint@v0.66.0...v0.67.0)

---
updated-dependencies:
- dependency-name: haml_lint
  dependency-version: 0.67.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump haml from 7.0.0 to 7.0.1

Bumps [haml](https://haml.info) from 7.0.0 to 7.0.1.

---
updated-dependencies:
- dependency-name: haml
  dependency-version: 7.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rails from 7.2.2.2 to 7.2.3

Bumps [rails](https://github.com/rails/rails) from 7.2.2.2 to 7.2.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](rails/rails@v7.2.2.2...v7.2.3)

---
updated-dependencies:
- dependency-name: rails
  dependency-version: 7.2.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump actions/setup-node from 5 to 6

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 5 to 6.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v5...v6)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump responders from 3.1.1 to 3.2.0

Bumps [responders](https://github.com/heartcombo/responders) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/heartcombo/responders/releases)
- [Changelog](https://github.com/heartcombo/responders/blob/main/CHANGELOG.md)
- [Commits](heartcombo/responders@v3.1.1...v3.2.0)

---
updated-dependencies:
- dependency-name: responders
  dependency-version: 3.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump bullet from 8.0.8 to 8.1.0

Bumps [bullet](https://github.com/flyerhzm/bullet) from 8.0.8 to 8.1.0.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](flyerhzm/bullet@8.0.8...8.1.0)

---
updated-dependencies:
- dependency-name: bullet
  dependency-version: 8.1.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump query_diet from 0.7.2 to 0.7.3

Bumps [query_diet](https://github.com/makandra/query_diet) from 0.7.2 to 0.7.3.
- [Changelog](https://github.com/makandra/query_diet/blob/master/CHANGELOG.md)
- [Commits](makandra/query_diet@v0.7.2...v0.7.3)

---
updated-dependencies:
- dependency-name: query_diet
  dependency-version: 0.7.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump oj from 3.16.11 to 3.16.12

Bumps [oj](https://github.com/ohler55/oj) from 3.16.11 to 3.16.12.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](ohler55/oj@v3.16.11...v3.16.12)

---
updated-dependencies:
- dependency-name: oj
  dependency-version: 3.16.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump scout_apm from 5.7.1 to 5.8.0

Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 5.7.1 to 5.8.0.
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](scoutapp/scout_apm_ruby@v5.7.1...v5.8.0)

---
updated-dependencies:
- dependency-name: scout_apm
  dependency-version: 5.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump axe-core-capybara from 4.10.3 to 4.11.0

Bumps [axe-core-capybara](https://github.com/dequelabs/axe-core-gems) from 4.10.3 to 4.11.0.
- [Release notes](https://github.com/dequelabs/axe-core-gems/releases)
- [Changelog](https://github.com/dequelabs/axe-core-gems/blob/develop/CHANGELOG.md)
- [Commits](dequelabs/axe-core-gems@v4.10.3...v4.11.0)

---
updated-dependencies:
- dependency-name: axe-core-capybara
  dependency-version: 4.11.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rake from 13.3.0 to 13.3.1

Bumps [rake](https://github.com/ruby/rake) from 13.3.0 to 13.3.1.
- [Release notes](https://github.com/ruby/rake/releases)
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc)
- [Commits](ruby/rake@v13.3.0...v13.3.1)

---
updated-dependencies:
- dependency-name: rake
  dependency-version: 13.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rubocop from 1.81.6 to 1.81.7

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.81.6 to 1.81.7.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop@v1.81.6...v1.81.7)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-version: 1.81.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rswag-specs from 2.16.0 to 2.17.0

Bumps [rswag-specs](https://github.com/rswag/rswag) from 2.16.0 to 2.17.0.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/2.17.0/CHANGELOG.md)
- [Commits](rswag/rswag@2.16.0...2.17.0)

---
updated-dependencies:
- dependency-name: rswag-specs
  dependency-version: 2.17.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rswag-ui from 2.16.0 to 2.17.0

Bumps [rswag-ui](https://github.com/rswag/rswag) from 2.16.0 to 2.17.0.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/2.17.0/CHANGELOG.md)
- [Commits](rswag/rswag@2.16.0...2.17.0)

---
updated-dependencies:
- dependency-name: rswag-ui
  dependency-version: 2.17.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rswag-api from 2.16.0 to 2.17.0

Bumps [rswag-api](https://github.com/rswag/rswag) from 2.16.0 to 2.17.0.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/2.17.0/CHANGELOG.md)
- [Commits](rswag/rswag@2.16.0...2.17.0)

---
updated-dependencies:
- dependency-name: rswag-api
  dependency-version: 2.17.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rubocop-factory_bot from 2.27.1 to 2.28.0

Bumps [rubocop-factory_bot](https://github.com/rubocop/rubocop-factory_bot) from 2.27.1 to 2.28.0.
- [Release notes](https://github.com/rubocop/rubocop-factory_bot/releases)
- [Changelog](https://github.com/rubocop/rubocop-factory_bot/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop-factory_bot@v2.27.1...v2.28.0)

---
updated-dependencies:
- dependency-name: rubocop-factory_bot
  dependency-version: 2.28.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump i18n-tasks from 1.0.15 to 1.1.0

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 1.0.15 to 1.1.0.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md)
- [Commits](glebm/i18n-tasks@v1.0.15...v1.1.0)

---
updated-dependencies:
- dependency-name: i18n-tasks
  dependency-version: 1.1.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rubocop-rspec_rails from 2.31.0 to 2.32.0

Bumps [rubocop-rspec_rails](https://github.com/rubocop/rubocop-rspec_rails) from 2.31.0 to 2.32.0.
- [Release notes](https://github.com/rubocop/rubocop-rspec_rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rspec_rails/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop-rspec_rails@v2.31.0...v2.32.0)

---
updated-dependencies:
- dependency-name: rubocop-rspec_rails
  dependency-version: 2.32.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump js-yaml from 3.14.1 to 3.14.2

Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.14.1 to 3.14.2.
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](nodeca/js-yaml@3.14.1...3.14.2)

---
updated-dependencies:
- dependency-name: js-yaml
  dependency-version: 3.14.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump haml from 7.0.1 to 7.0.2

Bumps [haml](https://github.com/haml/haml) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md)
- [Commits](haml/haml@v7.0.1...v7.0.2)

---
updated-dependencies:
- dependency-name: haml
  dependency-version: 7.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump actions/checkout from 5 to 6

Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rubocop-rspec from 3.7.0 to 3.8.0

Bumps [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/rubocop/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop-rspec@v3.7.0...v3.8.0)

---
updated-dependencies:
- dependency-name: rubocop-rspec
  dependency-version: 3.8.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump rubocop-rails from 2.33.4 to 2.34.1

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.33.4 to 2.34.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop-rails@v2.33.4...v2.34.1)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-version: 2.34.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* feat: Add YouTube video to crop page

This commit introduces the following changes:

- Adds an `en_youtube_url` attribute to the `Crop` model to store a URL for an English language YouTube video.
- If a `en_youtube_url` is present for a crop, the video is embedded on the crop's show page.
- A link is added to the "Learn more" section of the crop's show page to search YouTube for "growing [crop name]".
- A helper method is added to extract the video ID from various YouTube URL formats.
- A validation is added to the `Crop` model to ensure that the `en_youtube_url` is a valid YouTube URL.

* feat: Add YouTube video to crop page

This commit introduces the following changes:

- Adds an `en_youtube_url` attribute to the `Crop` model to store a URL for an English language YouTube video.
- The `en_youtube_url` is now an editable field in the crop form.
- If a `en_youtube_url` is present for a crop, the video is embedded on the crop's show page.
- A link is added to the "Learn more" section of the crop's show page to search YouTube for "growing [crop name]".
- A helper method is added to extract the video ID from various YouTube URL formats.
- A validation is added to the `Crop` model to ensure that the `en_youtube_url` is a valid YouTube URL.

* Bump i18n-tasks from 1.1.0 to 1.1.2

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 1.1.0 to 1.1.2.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md)
- [Commits](glebm/i18n-tasks@v1.1.0...v1.1.2)

---
updated-dependencies:
- dependency-name: i18n-tasks
  dependency-version: 1.1.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Rearrange

* feat: Migrate crop description to a dedicated column

This change migrates the crop description from the `openfarm_data` JSONB field to a new, dedicated `description` text column in the `crops` table.

A data migration is included to move the existing description data to the new column. The `OpenFarmData` concern is updated to remove the now-redundant `description` method.

* Merge pull request #4332 from Growstuff/crops-controller

Add coverage for crops

* I have added the `before_destroy` callback to the `Crop` model to destroy all `CropCompanion` records where the crop is `crop_b`. (#4266)

I have added a new test to `spec/models/crop_spec.rb` to verify that deleting a crop also destroys the associated `CropCompanion` records.

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
    @CloCkWeRX @dependabot @google-labs-jules
    3 people authored Nov 29, 2025
    Configuration menu
    Copy the full SHA
    e5aa2aa View commit details
    Browse the repository at this point in the history

  2. On show, fall back to parent crop if no detail known

    @CloCkWeRX
    CloCkWeRX committed Nov 29, 2025
    Configuration menu
    Copy the full SHA
    370c868 View commit details
    Browse the repository at this point in the history

  3. Show parent crop details if known

    @CloCkWeRX
    CloCkWeRX committed Nov 29, 2025
    Configuration menu
    Copy the full SHA
    208720c View commit details
    Browse the repository at this point in the history

  4. Fallback to parent for photos, youtube

    @CloCkWeRX
    CloCkWeRX committed Nov 29, 2025
    Configuration menu
    Copy the full SHA
    f7e1aaf View commit details
    Browse the repository at this point in the history

  5. Show parent crop

    @CloCkWeRX
    CloCkWeRX committed Nov 29, 2025
    Configuration menu
    Copy the full SHA
    4fd544c View commit details
    Browse the repository at this point in the history

  6. Better fallback

    @CloCkWeRX
    CloCkWeRX committed Nov 29, 2025
    Configuration menu
    Copy the full SHA
    6503e25 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #4333 from Growstuff/parent-fallback 

    Crops > Show detail from parent
    @CloCkWeRX
    CloCkWeRX authored Nov 29, 2025
    Configuration menu
    Copy the full SHA
    1f0777f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'mainline' into dev

    @CloCkWeRX
    CloCkWeRX authored Nov 29, 2025
    Configuration menu
    Copy the full SHA
    372a5ed View commit details
    Browse the repository at this point in the history
Loading