Skip to content

Comments

[pull] main from forem:main#80

Merged
pull[bot] merged 3 commits intoamishakov:mainfrom
forem:main
Sep 18, 2025
Merged

[pull] main from forem:main#80
pull[bot] merged 3 commits intoamishakov:mainfrom
forem:main

Conversation

@pull
Copy link

@pull pull bot commented Sep 18, 2025

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

benhalpern and others added 3 commits September 18, 2025 11:20
…2336)

* feat: Add user setting to disable automatic subforem reassignment

- Add disallow_subforem_reassignment boolean setting to users_settings table
- Default to false (allow reassignment) to maintain existing behavior
- Add setting to customization tab with clear 'disable' language
- Update SubforemReassignmentService to respect user preference
- Add comprehensive tests including request specs
- Add translations for English, French, and Portuguese
- Users can now opt out of automatic content relocation to other subforems

Co-authored-by: Ona <no-reply@ona.com>

* Fix migration file naming and apply database changes

- Rename migration file to match class name
- Add config.active_record.partial_inserts = false to resolve strong_migrations conflicts
- Successfully apply migration to create disallow_subforem_reassignment column
- Update schema.rb with new column

Co-authored-by: Ona <no-reply@ona.com>

* Fix SubforemReassignmentService tests for nil user scenarios

- Replace article.update!(user: nil) with proper mocking to avoid validation errors
- Mock article.user and article.update! methods to handle nil user cases
- Use save!(validate: false) in mocked update! to bypass user validation
- All 77 SubforemReassignmentService tests now pass

The Article model requires a user, but the service logic is designed to handle
nil users gracefully. Tests now properly mock this scenario without violating
model validations.

Co-authored-by: Ona <no-reply@ona.com>

---------

Co-authored-by: Ona <no-reply@ona.com>
- Update active_help scope to use configurable Settings::UserExperience.home_feed_minimum_score instead of hardcoded -3
- Ensure consistency with other sidebar sections that already use .with_at_least_home_feed_minimum_score
- Update tests to work with configurable minimum score and add test for score filtering behavior
- active_threads method already correctly uses minimum score filtering via Articles::ActiveThreadsQuery

This ensures that sidebar tag sections (both help and regular tags) respect the same
minimum score configuration as the main home feed, providing consistent content quality.

Co-authored-by: Ona <no-reply@ona.com>
@pull pull bot locked and limited conversation to collaborators Sep 18, 2025
@pull pull bot added the ⤵️ pull label Sep 18, 2025
@pull pull bot merged commit 5ef694b into amishakov:main Sep 18, 2025
2 of 3 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant