diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-01-08 06:11:46 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-01-08 06:11:46 +0000 |
| commit | 273e7420d4913b01f73242cae693ba6069702a2a (patch) | |
| tree | b96dc526dfb403615168062cb485576927fc2baf | |
| parent | c92f4253097fa846f32e3a9193692b74af6ba7b8 (diff) | |
| download | redmine-273e7420d4913b01f73242cae693ba6069702a2a.tar.gz redmine-273e7420d4913b01f73242cae693ba6069702a2a.zip | |
Rails4: replace deprecated passing options to find at MessagesController
git-svn-id: http://svn.redmine.org/redmine/trunk@12520 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/messages_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 585101fbd..9eb12147d 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -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 |