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, 6 insertions, 6 deletions

diff --git a/app/views/occurrences/edit.html.erb b/app/views/occurrences/edit.html.erb
index 6a81188c..aa4f6e07 100644
--- a/app/views/occurrences/edit.html.erb
+++ b/app/views/occurrences/edit.html.erb
@@ -1,7 +1,7 @@
 <h1>Editing occurrence</h1>
 
-<% form_for(@occurrence) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@occurrence) do |f| %>
+  <%= form_error_messages(f) %>
 
   <p>
     <%= f.label :summary %><br />
@@ -29,4 +29,4 @@
 <% end %>
 
 <%= link_to 'Show', @occurrence %> |
-<%= link_to 'Back', occurrences_path %>
\ No newline at end of file
+<%= link_to 'Back', occurrences_path %>
diff --git a/app/views/occurrences/new.html.erb b/app/views/occurrences/new.html.erb
index 0a77af15..c05ce400 100644
--- a/app/views/occurrences/new.html.erb
+++ b/app/views/occurrences/new.html.erb
@@ -1,7 +1,7 @@
 <h1>New occurrence</h1>
 
-<% form_for(@occurrence) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@occurrence) do |f| %>
+  <%= form_error_messages(f) %>
 
   <p>
     <%= f.label :summary %><br />
@@ -28,4 +28,4 @@
   </p>
 <% end %>
 
-<%= link_to 'Back', occurrences_path %>
\ No newline at end of file
+<%= link_to 'Back', occurrences_path %>