mirror of
https://github.com/meineerde/redmine.git
synced 2025-12-19 15:01:14 +00:00
Ported r1034 and r1140 from trunk.
git-svn-id: http://redmine.rubyforge.org/svn/branches/0.6-stable@1141 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
bd7542cf98
commit
7e9dd78de8
@ -1,6 +1,6 @@
|
|||||||
class AllowNullVersionEffectiveDate < ActiveRecord::Migration
|
class AllowNullVersionEffectiveDate < ActiveRecord::Migration
|
||||||
def self.up
|
def self.up
|
||||||
change_column :versions, :effective_date, :date, :default => nil
|
change_column :versions, :effective_date, :date, :default => nil, :null => true
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.down
|
def self.down
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
class AllowNullPosition < ActiveRecord::Migration
|
class AllowNullPosition < ActiveRecord::Migration
|
||||||
def self.up
|
def self.up
|
||||||
# removes the 'not null' constraint on position fields
|
# removes the 'not null' constraint on position fields
|
||||||
change_column :issue_statuses, :position, :integer, :default => 1
|
change_column :issue_statuses, :position, :integer, :default => 1, :null => true
|
||||||
change_column :roles, :position, :integer, :default => 1
|
change_column :roles, :position, :integer, :default => 1, :null => true
|
||||||
change_column :trackers, :position, :integer, :default => 1
|
change_column :trackers, :position, :integer, :default => 1, :null => true
|
||||||
change_column :boards, :position, :integer, :default => 1
|
change_column :boards, :position, :integer, :default => 1, :null => true
|
||||||
change_column :enumerations, :position, :integer, :default => 1
|
change_column :enumerations, :position, :integer, :default => 1, :null => true
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.down
|
def self.down
|
||||||
|
|||||||
@ -119,7 +119,7 @@ module Redmine
|
|||||||
end
|
end
|
||||||
rescue Errno::ENOENT => e
|
rescue Errno::ENOENT => e
|
||||||
# The command failed, log it and re-raise
|
# The command failed, log it and re-raise
|
||||||
log.error("SCM command failed: #{cmd}\n with: #{e.message}")
|
logger.error("SCM command failed: #{cmd}\n with: #{e.message}")
|
||||||
raise CommandFailed
|
raise CommandFailed
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user