Stage 1 complete: Rails 2.3.5 to Rails 3.2.22.5 upgrade

- Converted plugins to gems (Gemfile)
- Updated config structure (application.rb, boot.rb, environment.rb)
- Converted routes to Rails 3 DSL
- Converted named_scope to scope throughout models
- Converted find(:all, :conditions) to where() chains
- Fixed has_many :order to use ordering scope
- Updated session store and secret token configuration
- Fixed exception_notification middleware configuration
- Patched Ruby 2.4 / Rails 3.2 incompatibilities:
  - Integer/Float duration arithmetic (ActiveSupport)
  - Arel visit_Integer for PostgreSQL adapter
  - create_database String/Integer coercion
  - ActionController consider_all_requests_local
- Migrated taggings schema for acts-as-taggable-on
- Replaced dynamic_form gem with custom form_error_messages helper
- Fixed Rails 3 block helper syntax (form_for, form_tag, fields_for)
- Fixed admin layout yield
- Updated test suite for Rails 3 APIs

1 files changed, 3 insertions, 6 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 95aed48..7c082c4 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -15,12 +15,9 @@ class NodesController < ApplicationController
                             ]
 
   def index
-    @nodes = Node.root.descendants.paginate( 
-      :include => [:head, :draft],
-      :page => params[:page], 
-      :per_page => 25,
-      :order => 'id DESC'
-    )
+    @nodes = Node.root.descendants.includes(:head, :draft)
+      .order('id DESC')
+      .paginate(:page => params[:page], :per_page => 25)
   end
 
   def new