summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-10-04 18:15:05 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-10-04 18:15:05 +0000
commit5411f93a9aec92a45dd5895a0a30340d9585defd (patch)
treec7accf5633dbdca9108ea9bdc86cd670b9613cac
parentcbe822675986ee3b91b9843ce4e54e91a63b5e60 (diff)
downloadredmine-5411f93a9aec92a45dd5895a0a30340d9585defd.tar.gz
redmine-5411f93a9aec92a45dd5895a0a30340d9585defd.zip
Passing the format in the template name is deprecated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10561 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8cdef289a..5be896ee4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -402,7 +402,7 @@ class ApplicationController < ActionController::Base
@items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
@items = @items.slice(0, Setting.feeds_limit.to_i)
@title = options[:title] || Setting.app_title
- render :template => "common/feed.atom", :layout => false,
+ render :template => "common/feed", :formats => [:atom], :layout => false,
:content_type => 'application/atom+xml'
end