]> source.dussan.org Git - redmine.git/commitdiff
Rails4: replace deprecated passing options to find at MessagesController
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 8 Jan 2014 06:11:46 +0000 (06:11 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 8 Jan 2014 06:11:46 +0000 (06:11 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@12520 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/messages_controller.rb

index 585101fbde0d9ba96a8e22e79327fcb47a7615bb..9eb12147d0a649d877158b5004c67697a370536c 100644 (file)
@@ -126,14 +126,14 @@ class MessagesController < ApplicationController
 private
   def find_message
     return unless find_board
-    @message = @board.messages.find(params[:id], :include => :parent)
+    @message = @board.messages.includes(:parent).find(params[:id])
     @topic = @message.root
   rescue ActiveRecord::RecordNotFound
     render_404
   end
 
   def find_board
-    @board = Board.find(params[:board_id], :include => :project)
+    @board = Board.includes(:project).find(params[:board_id])
     @project = @board.project
   rescue ActiveRecord::RecordNotFound
     render_404