rails/rails

Add #25546 and #25817 to changelog [ci skip]
#26591

philipqnguyen wants to merge philipqnguyen:changelog-fix-etag-template into rails:master

Compare on GitHub

We do not currently have an analysis of these two commits