diff options
| -rw-r--r-- | Rakefile | 4 | ||||
| -rw-r--r-- | config/httpd.conf-example | 2 | ||||
| -rw-r--r-- | doc/CHANGES.md | 9 |
3 files changed, 13 insertions, 2 deletions
@@ -4,4 +4,6 @@ require File.expand_path('../config/application', __FILE__) require 'rake' Alaveteli::Application.load_tasks -Dir[File.join(File.dirname(__FILE__),'commonlib','rblib','tests','*.rake')].each { |file| load(file) } +if Rails.env == 'test' + Dir[File.join(File.dirname(__FILE__),'commonlib','rblib','tests','*.rake')].each { |file| load(file) } +end diff --git a/config/httpd.conf-example b/config/httpd.conf-example index 06170a5e2..1326252f5 100644 --- a/config/httpd.conf-example +++ b/config/httpd.conf-example @@ -1,4 +1,4 @@ -# Apache configuracreated_attion for FOI site. +# Apache configuration for FOI site. # # For development ignore this, you can just run ./scripts/server as for any # Ruby on Rails application. diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 9a027a3a8..156c4d0dc 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -1,3 +1,12 @@ +# Version 0.11 +## Highlighted features +* Upgrade of the Rails framework to version 3.1.12 (Henare Degan, Matthew Landauer, Mark Longair, Louise Crow) + +## Upgrade notes +* Manually remove vendor/rails-locales +* Themes created for 0.9 and below should be updated to work with Rails 3. See `THEMES-UPGRADE.md` for notes on upgrading your theme. You will need to manually remove your old theme directory before running `rails-post-deploy`. +* The `config/httpd.conf` has moved to `config/httpd.conf`, as it may need customization before deploying. It also has a new line setting RackEnv to production - copy this to your config/httpd.conf file. + # Version 0.9 ## Highlighted features * Consistent and more informative variable interpolation syntax in translated phrases. All of these phrases will now appear in the form "There are {{count}} people following this request", where some were previously in the form "There are %s people following this request". (Matthew Landauer) |