Merge next-release/v5.0.2 into main - #3570
Merged
Merged
Conversation
Removed the hardcoded `ruby-version` from GitHub Actions workflows. - `ruby/setup-ruby` now reads the version from `.ruby-version`. - Avoids duplication and keeps CI consistent with local development
Bump Ruby to v3.1.4 and use `.ruby-version` in CI
Timeout session after inactivity
Validate CSV Separator
- This change simplifies the partial naming by taking advantage of Rails' naming conventions and resolves the following error:
```
ActionView::MissingTemplate - Missing partial super_admin/users/_confirm_merge.html.erb with {:locale=>[:"en-CA", :en, :"en-GB"], :formats=>[:js, :html, :text, :css, :ics, :csv, :vcf, :vtt, :png, :jpeg, :gif, :bmp, :tiff, :svg, :webp, :mpeg, :mp3, :ogg, :m4a, :webm, :mp4, :otf, :ttf, :woff, :woff2, :xml, :rss, :atom, :yaml, :multipart_form, :url_encoded_form, :json, :pdf, :zip, :gzip, :docx, :turbo_stream], :variants=>[], :handlers=>[:raw, :erb, :html, :builder, :ruby, :jbuilder]}.
...
app/controllers/super_admin/users_controller.rb:94:in `search'
```
- The prior `'super_admin/users/confirm_merge.html.erb'` code works with release`v4.2`, which uses Rails 6. However, it generates the following deprecation warning:
```
DEPRECATION WARNING: Rendering actions with '.' in the name is deprecated: super_admin/users/_confirm_merge.html.erb (called from search at /home/aaron/Documents/GitHub/roadmap_upstream/app/controllers/super_admin/users_controller.rb:94)
```
Fix rendering of `confirm_merge` partial
momo3404
approved these changes
Oct 7, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes proposed in this PR:
.ruby-versionin CI #3566confirm_mergepartial #3567Additional Notes