diff options
| author | francis <francis> | 2008-01-23 03:27:28 +0000 |
|---|---|---|
| committer | francis <francis> | 2008-01-23 03:27:28 +0000 |
| commit | 5b3b29edda9238035bf4654964313b43a8df0d1e (patch) | |
| tree | c071a77f0a92f7d87102b41245a0a6d2cf0073b8 | |
| parent | 09a3e13d86897883f51eb6ddaa7d8f20d47a93d2 (diff) | |
Various other Rails 2 related bits.
| -rw-r--r-- | app/views/request_mailer/initial_request.rhtml | 3 | ||||
| -rw-r--r-- | config/environment.rb | 2 | ||||
| -rw-r--r-- | db/schema.rb | 8 | ||||
| -rw-r--r-- | todo.txt | 4 | ||||
| -rw-r--r-- | vendor/rails-2.0.2/railties/lib/commands/console.rb | 1 |
5 files changed, 9 insertions, 9 deletions
diff --git a/app/views/request_mailer/initial_request.rhtml b/app/views/request_mailer/initial_request.rhtml index e4c11d13f..564c3f5fb 100644 --- a/app/views/request_mailer/initial_request.rhtml +++ b/app/views/request_mailer/initial_request.rhtml @@ -1,4 +1,5 @@ -<%= @outgoing_message.body %> +<%= @outgoing_message.body.strip %> + ------------------------------------------------------------------- Disclaimer: This message and all responses to it are public. Any reply that you make will be published on the Internet. diff --git a/config/environment.rb b/config/environment.rb index 5408056ad..81257c0aa 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -6,7 +6,7 @@ # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '1.2.5' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') diff --git a/db/schema.rb b/db/schema.rb index dccf6924c..8b60cbe2c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 25) do +ActiveRecord::Schema.define(:version => 26) do create_table "incoming_messages", :force => true do |t| t.integer "info_request_id" @@ -93,9 +93,9 @@ ActiveRecord::Schema.define(:version => 25) do add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at" create_table "users", :force => true do |t| - t.string "email", :default => "ook" - t.string "name" - t.string "hashed_password" + t.string "email", :null => false + t.string "name", :null => false + t.string "hashed_password", :null => false t.string "salt" t.datetime "created_at" t.datetime "updated_at" @@ -119,9 +119,7 @@ Make it so if the pipe fails, exim tries again rather than sending an error to t Synthesise these tips into our handful of snappy snappy bullet points http://community.foe.co.uk/tools/right_to_know/tips.html -Change to Rails 2, may as well do it now rather than later. -http://www.slashdotdash.net/articles/2007/12/03/rails-2-upgrade-notes -See if occasional fastcgi errors then go away +See if occasional fastcgi errors go away now with Rails 2 [Mon Jan 21 10:38:45 2008] [error] [client 81.107.40.81] FastCGI: incomplete headers (0 bytes) rec eived from server "/data/vhost/foi.mysociety.org/docs/dispatch.fcgi" diff --git a/vendor/rails-2.0.2/railties/lib/commands/console.rb b/vendor/rails-2.0.2/railties/lib/commands/console.rb index edb135ff4..fd53afd47 100644 --- a/vendor/rails-2.0.2/railties/lib/commands/console.rb +++ b/vendor/rails-2.0.2/railties/lib/commands/console.rb @@ -29,4 +29,5 @@ if options[:sandbox] else puts "Loading #{ENV['RAILS_ENV']} environment (Rails #{Rails::VERSION::STRING})" end +#puts "FAITEMP #{options[:irb]} #{libs} --simple-prompt" # FAI temp exec "#{options[:irb]} #{libs} --simple-prompt" |