google-labs-jules[bot] 842a221b23 I've also added the necessary authorization. ...

I've added a 'Merge Duplicates' button to the wrangle page, which links to the new merge page.

It contains a form with two fields for the master and duplicate crop slugs.

This method moves all associated objects from a duplicate crop to the master crop and then deletes the duplicate crop. The entire operation is wrapped in a database transaction.

I've updated the `merge` action in `crops_controller.rb` to prevent a crop from being merged with itself. The implementation of the controller action is now complete.

2025-09-21 23:09:17 +00:00

..

admin

Add ability to create companion plantings

2025-09-21 00:49:11 +00:00

api/v1

Add API token generation, authentication, and CRUD for a number of the API resources (#4237)

2025-09-10 19:50:06 +09:30

charts

Routes using slugs (instead of ids)

2019-12-26 23:30:23 +00:00

activities_controller.rb

Adjust copy of activities and prompts (#4260)

2025-09-21 14:58:13 +09:30

admin_controller.rb

Issues/1475: Ensure we have pagination (#3193)

2024-01-21 14:19:36 +10:30

alternate_names_controller.rb

Add international alternate names for crops (#4132)

2025-08-24 21:44:41 +09:30

application_controller.rb

Merge pull request #4131 from Growstuff/feature/add-social-media-links

2025-08-24 16:21:05 +09:30

authentications_controller.rb

Rubocop - auto corrections

2022-11-06 16:34:36 +10:30

comments_controller.rb

Add comments to photos (#4130)

2025-08-24 21:10:16 +09:30

conversations_controller.rb

Rubocop - auto corrections

2022-11-06 16:34:36 +10:30

crops_controller.rb

I've also added the necessary authorization.

2025-09-21 23:09:17 +00:00

data_controller.rb

Routes using slugs (instead of ids)

2019-12-26 23:30:23 +00:00

follows_controller.rb

Various rspec autocorrections

2022-11-08 00:09:50 +10:30

forums_controller.rb

Update with frozen literals

2019-12-26 13:38:17 +13:00

garden_collaborators_controller.rb

Garden collaboration (small part of community gardens) (#3862)

2024-09-29 18:28:52 +09:30

garden_types_controller.rb

Update with frozen literals

2019-12-26 13:38:17 +13:00

gardens_controller.rb

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

2025-09-20 17:49:47 +09:30

harvests_controller.rb

deprecations

2022-11-06 17:44:23 +10:30

home_controller.rb

Update with frozen literals

2019-12-26 13:38:17 +13:00

likes_controller.rb

Ruby 3.2: Rubocop - Fix Lint/symbol conversion (#3781)

2024-07-13 15:11:49 +09:30

members_controller.rb

Remove twitter authentication

2025-08-24 07:03:20 +00:00

messages_controller.rb

Ruby 3.2: Rubocop - Lint/* and Style/* (#3786)

2024-07-13 15:38:37 +09:30

omniauth_callbacks_controller.rb

Remove twitter authentication

2025-08-24 07:03:20 +00:00

pages_controller.rb

Update with frozen literals

2019-12-26 13:38:17 +13:00

passwords_controller.rb

Update with frozen literals

2019-12-26 13:38:17 +13:00

photo_associations_controller.rb

Update with frozen literals

2019-12-26 13:38:17 +13:00

photos_controller.rb

Add comments to photos (#4130)

2025-08-24 21:10:16 +09:30

places_controller.rb

Update with frozen literals

2019-12-26 13:38:17 +13:00

plant_parts_controller.rb

Issues/1475: Ensure we have pagination (#3193)

2024-01-21 14:19:36 +10:30

plantings_controller.rb

Adjust copy of activities and prompts (#4260)

2025-09-21 14:58:13 +09:30

posts_controller.rb

fix specs

2020-02-10 14:21:03 +13:00

registrations_controller.rb

Rubocop (#4241)

2025-09-10 19:56:12 +09:30

robots_controller.rb

Update with frozen literals

2019-12-26 13:38:17 +13:00

scientific_names_controller.rb

Issues/1475: Ensure we have pagination (#3193)

2024-01-21 14:19:36 +10:30

seeds_controller.rb

Add seed source to Seed model (#4186)

2025-09-01 21:47:31 +09:30

sessions_controller.rb

Update with frozen literals

2019-12-26 13:38:17 +13:00

timeline_controller.rb

Update with frozen literals

2019-12-26 13:38:17 +13:00