diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/crontab.ugly | 2 | ||||
| -rw-r--r-- | config/deploy.rb | 1 | ||||
| -rw-r--r-- | config/environment.rb | 4 | ||||
| -rw-r--r-- | config/httpd.conf | 2 | ||||
| -rw-r--r-- | config/initializers/fast_gettext.rb | 1 | ||||
| -rw-r--r-- | config/initializers/missing_source_file.rb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/config/crontab.ugly b/config/crontab.ugly index fe0c992d8..894b464cf 100644 --- a/config/crontab.ugly +++ b/config/crontab.ugly @@ -3,8 +3,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org. WWW: http://www.mysociety.org/ -# -# $Id: crontab.ugly,v 1.36 2009-09-20 10:29:36 francis Exp $ PATH=/usr/local/bin:/usr/bin:/bin MAILTO=cron-!!(*= $site *)!!@mysociety.org diff --git a/config/deploy.rb b/config/deploy.rb index f82379df0..5e1c3aa0d 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -48,6 +48,7 @@ namespace :deploy do links = { "#{release_path}/config/database.yml" => "#{shared_path}/database.yml", "#{release_path}/config/general.yml" => "#{shared_path}/general.yml", + "#{release_path}/config/memcached.yml" => "#{shared_path}/memcached.yml", "#{release_path}/config/rails_env.rb" => "#{shared_path}/rails_env.rb", "#{release_path}/public/foi-live-creation.png" => "#{shared_path}/foi-live-creation.png", "#{release_path}/public/foi-user-use.png" => "#{shared_path}/foi-user-use.png", diff --git a/config/environment.rb b/config/environment.rb index 3348ef92a..4ae3f26d9 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,5 +1,9 @@ # Be sure to restart your web server when you modify this file. +# the default encoding for IO is utf-8, and we use utf-8 internally +if RUBY_VERSION.to_f >= 1.9 + Encoding.default_external = Encoding.default_internal = Encoding::UTF_8 +end # Uncomment below to force Rails into production mode when # you don't control web/app server and can't set it the proper way diff --git a/config/httpd.conf b/config/httpd.conf index 129b1577b..440da0d87 100644 --- a/config/httpd.conf +++ b/config/httpd.conf @@ -5,8 +5,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org -# -# $Id: httpd.conf,v 1.31 2009-09-02 13:05:48 matthew Exp $ # This is needed for the PHP spell checker <Location /fcgi> diff --git a/config/initializers/fast_gettext.rb b/config/initializers/fast_gettext.rb index 721c49cd0..2ecf5cb5d 100644 --- a/config/initializers/fast_gettext.rb +++ b/config/initializers/fast_gettext.rb @@ -1,4 +1,3 @@ -Encoding.default_external = 'UTF-8' if RUBY_VERSION.to_f >= 1.9 FastGettext.add_text_domain 'app', :path => File.join(Rails.root, 'locale'), :type => :po FastGettext.default_text_domain = 'app' diff --git a/config/initializers/missing_source_file.rb b/config/initializers/missing_source_file.rb new file mode 100644 index 000000000..a114fa972 --- /dev/null +++ b/config/initializers/missing_source_file.rb @@ -0,0 +1,2 @@ +# For Rails 2.3 on Ruby 1.9.3 @see https://github.com/rails/rails/pull/3745 +MissingSourceFile::REGEXPS << [/^cannot load such file -- (.+)$/i, 1] diff --git a/config/routes.rb b/config/routes.rb index 34232b55b..5fc0075a4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: routes.rb,v 1.92 2009-10-14 22:01:27 francis Exp $ # Allow easy extension from themes. Note these will have the highest priority. $alaveteli_route_extensions.each do |f| |