Skip to content

[pull] main from forem:main - #382

Merged
pull[bot] merged 5 commits into
amishakov:mainfrom
forem:main
Sep 4, 2026
Merged

pull[bot] merged 5 commits into
amishakov:mainfrom
forem:main

Conversation

@pull

@pull pull Bot commented Sep 4, 2026 •

Copy link
Copy Markdown

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 5 commits September 3, 2026 15:07
- Add beta_testing: 3 to Survey.type_of enum
- Set subject to 'You\'ve been randomly selected for a beta testing survey' for beta_testing surveys
- Update pulse_survey.html.erb with beta testing invitation copy and CTA button
- Regenerate OpenAPI schema with beta_testing in swagger/v1/api_v1.json
- Add mailer and Customer.io regression specs for beta_testing surveys
* Grant unlimited gems to admin curators

* Nudge CI workflow
* Modified before_destroy_actions and add testing

* Revert commit and move testing to dif file

* Add TimeHelpers to the test

* Fix and add testing for comments related issue

* Update app/controllers/stories_controller.rb

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update app/models/article.rb

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update spec/requests/user/user_profile_comments_spec.rb

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update app/controllers/stories_controller.rb

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Fix profile comment count scoping, sidebar cache key, and guest CTA

* Address profile comment count regressions, nil safety, and edge case tests

- Initialize @user_profile_comments_count to 0 to avoid nil fallback in views
- Clean up dead-code fallback query in sidebar stats cache block
- Add defensive nil guards on user for article destruction
- Add exhaustive specs for 0 comments, unpublished posts, subforems, and ?view=comments

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Mikey Dorje <mikeydorje@gmail.com>
… home feed (#23813)

- Include favorited articles in Article.with_at_least_home_feed_minimum_score to bypass minimum feed score threshold
- Add +200 curation bonus for favorited articles in BlackBox.article_hotness_score, mirroring featured articles
- Add regression tests in BlackBox, Article, LargeForemExperimental, and StoriesIndex specs
@pull pull Bot locked and limited conversation to collaborators Sep 4, 2026
@pull pull Bot added the ⤵️ pull label Sep 4, 2026
@pull
pull Bot merged commit 2a9ee79 into amishakov:main Sep 4, 2026
2 of 4 checks passed

This branch had an error being deployed

1 failed deployment
staging — 2a9ee79e Deployed Sep 4, 2026 by pull[bot] via deploy (staging) #358
production — 2a9ee79e Deployed Sep 4, 2026 by pull[bot] via deploy (production) #358
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.

2 participants