summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2025-06-30 04:20:06 +0000
committerGo MAEDA <maeda@farend.jp>2025-06-30 04:20:06 +0000
commitb4d804bc51357a164a1d0854e36c5672f73cbaa9 (patch)
tree6a5b9bc567d3d7db6c54f1d39f9f03cd61e6a7d0
parentc39740564e4d49ac03be35e1a5276d2f4199856f (diff)
downloadredmine-6.0-stable.tar.gz
redmine-6.0-stable.zip
Merged r23847 from trunk to 6.0-stable (#42933).6.0-stable
git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23850 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/wiki_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 36b90da77..bcb3b0891 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -240,6 +240,7 @@ class WikiController < ApplicationController
# don't load text
@versions = @page.content.versions.
select("id, author_id, comments, updated_on, version").
+ preload(:author).
reorder('version DESC').
limit(@version_pages.per_page + 1).
offset(@version_pages.offset).