comparison app/controllers/news_controller.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

     scope = @project ? @project.news.visible : News.visible
 
     @news_count = scope.count
     @news_pages = Paginator.new @news_count, @limit, params['page']
     @offset ||= @news_pages.offset
-    @newss = scope.all(:include => [:author, :project],
-                                       :order => "#{News.table_name}.created_on DESC",
-                                       :offset => @offset,
-                                       :limit => @limit)
-
+    @newss = scope.includes([:author, :project]).
+                      order("#{News.table_name}.created_on DESC").
+                      limit(@limit).
+                      offset(@offset).
+                      all
     respond_to do |format|
       format.html {
         @news = News.new # for adding news inline
         render :layout => false if request.xhr?
       }