From fb864e50c45f26351cc0911134fcc47ed64cce17 Mon Sep 17 00:00:00 2001 From: Holger Just Date: Wed, 11 Aug 2010 09:28:40 +0200 Subject: [PATCH] Merge branch 'master' of git://github.com/edavis10/redmine --- db/migrate/20100705164950_change_changes_path_length_limit.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/db/migrate/20100705164950_change_changes_path_length_limit.rb b/db/migrate/20100705164950_change_changes_path_length_limit.rb index 5b2a99115..62b8644a4 100644 --- a/db/migrate/20100705164950_change_changes_path_length_limit.rb +++ b/db/migrate/20100705164950_change_changes_path_length_limit.rb @@ -1,13 +1,9 @@ class ChangeChangesPathLengthLimit < ActiveRecord::Migration def self.up -<<<<<<< HEAD # these are two steps to please MySQL 5 on Win32 change_column :changes, :path, :text, :default => nil, :null => true change_column :changes, :path, :text, :null => false -======= - change_column :changes, :path, :text, :null => false ->>>>>>> Force the default value of path to be set on the Change model class. This is needed because MySQL does not support default values on text columns (Error introduced in r3828, #5771) change_column :changes, :from_path, :text end