More Rails 3 upgrade progress
Finishing up Rails 3 upgrade