FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge `next-release/v5.0.2` into `main` by aaronskiba · Pull Request #3570 · DMPRoadmap/roadmap · GitHub

Repository navigation

Merge next-release/v5.0.2 into main - #3570

Merged
aaronskiba merged 20 commits into
mainfrom
next-release/v5.0.2
Oct 7, 2025
Merged

aaronskiba merged 20 commits into
mainfrom
next-release/v5.0.2

Conversation

Copy link
Copy Markdown
Contributor

Changes proposed in this PR:

  • Bump Ruby to v3.1.4 and use .ruby-version in CI #3566
  • Enable session timeout after 90 minutes of inactivity #3568
  • Validate CSV Separator #3569
  • Fix rendering of confirm_merge partial #3567
  • Improve CI configuration #3551

Additional Notes

aaronskiba and others added 20 commits October 2, 2025 10:21
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
- 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)
```
aaronskiba merged commit a6ebcac into main Oct 7, 2025
6 of 7 checks passed
aaronskiba deleted the next-release/v5.0.2 branch October 7, 2025 18:18
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants


Back | FazBrowse Home | New Git URL