Merge branch 'master' into feature/rails3

Conflicts: db/migrate/20110211160100_add_summary_to_projects.rb
12 years ago · 49dac58b47
parent b37e75219b b96208aad0
commit 49dac58b47
1 changed files with 1 additions and 1 deletions
--- a/db/migrate/20110211160100_add_summary_to_projects.rb
+++ b/db/migrate/20110211160100_add_summary_to_projects.rb
@ -1,6 +1,6 @@
 class AddSummaryToProjects < ActiveRecord::Migration
  def self.up
-    add_column :projects, :summary, :text, :default => nil
+    add_column :projects, :summary, :text
  end

  def self.down