1
0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 03:33:07 +00:00

Merge branch 'master' of git://github.com/edavis10/redmine

This commit is contained in:
Holger Just 2010-08-11 09:28:40 +02:00
parent 59905a2340
commit fb864e50c4

View File

@ -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