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

2 files changed, 5 insertions, 5 deletions

diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index f7ad79ca..efda85d0 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -5,7 +5,7 @@
 
 <h1>Revisions#diff</h1>
 
-<% form_tag diff_node_revisions_path do %>
+<%= form_tag diff_node_revisions_path do %>
   <%= select_tag :start_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:start_revision].to_i) %>
   <%= select_tag :end_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:end_revision].to_i) %>
   <%= submit_tag 'Diff' %>
@@ -62,4 +62,4 @@
   
   <h3>Body</h3>
   <p id="diffview_body"></p>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/revisions/index.html.erb b/app/views/revisions/index.html.erb
index dc9ad51a..306f9ea4 100644
--- a/app/views/revisions/index.html.erb
+++ b/app/views/revisions/index.html.erb
@@ -4,7 +4,7 @@
 
 <h2>Revisions for Node: <%= @node.unique_name %></h2>
 
-<% form_tag diff_node_revisions_path(@node) do %>
+<%= form_tag diff_node_revisions_path(@node) do %>
 <table id="revisions">
   <tr class="header">
     <th>First</th>
@@ -15,7 +15,7 @@
     <th>Date</th>
     <th></th>
   </tr>
-<% @node.pages.reverse.each do |page| %>
+<% (@pages || @node.pages.all).reverse.each do |page| %>
   <tr>
     <td><%= radio_button_tag :start_revision, page.revision %></td>
     <td><%= radio_button_tag :end_revision, page.revision %></td>
@@ -41,4 +41,4 @@
   </tr>
 </table>
 
-<% end %>
\ No newline at end of file
+<% end %>