Ported r1034 and r1140 from trunk.

git-svn-id: http://redmine.rubyforge.org/svn/branches/0.6-stable@1141 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/db/migrate/048_allow_null_version_effective_date.rb b/db/migrate/048_allow_null_version_effective_date.rb
index 4b46bfe0e47f08e69c5a7e44328f8c09021cc3bf..82d2a33eccc5d6fe31b73f796c704100dd75755e 100644 (file)
--- a/db/migrate/048_allow_null_version_effective_date.rb
+++ b/db/migrate/048_allow_null_version_effective_date.rb
@@ -1,6 +1,6 @@
 class AllowNullVersionEffectiveDate < ActiveRecord::Migration
   def self.up
-    change_column :versions, :effective_date, :date, :default => nil
+    change_column :versions, :effective_date, :date, :default => nil, :null => true
   end
 
   def self.down

diff --git a/db/migrate/076_allow_null_position.rb b/db/migrate/076_allow_null_position.rb
index 45008d653f045f1a8eca601df457f6ea5c8e66e0..ece0370dbe691b4a461f189be26fda8d8467f0c5 100644 (file)
--- a/db/migrate/076_allow_null_position.rb
+++ b/db/migrate/076_allow_null_position.rb
@@ -1,11 +1,11 @@
 class AllowNullPosition < ActiveRecord::Migration
   def self.up
     # removes the 'not null' constraint on position fields
-    change_column :issue_statuses, :position, :integer, :default => 1
-    change_column :roles, :position, :integer, :default => 1
-    change_column :trackers, :position, :integer, :default => 1
-    change_column :boards, :position, :integer, :default => 1
-    change_column :enumerations, :position, :integer, :default => 1
+    change_column :issue_statuses, :position, :integer, :default => 1, :null => true
+    change_column :roles, :position, :integer, :default => 1, :null => true
+    change_column :trackers, :position, :integer, :default => 1, :null => true
+    change_column :boards, :position, :integer, :default => 1, :null => true
+    change_column :enumerations, :position, :integer, :default => 1, :null => true
   end
 
   def self.down

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index c93fc6350633cb1896c0128ec9c67c76badc0e5c..2d6d73602b017e821308231b9db1168be3d2eec5 100644 (file)
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -119,7 +119,7 @@ module Redmine
             end
           rescue Errno::ENOENT => e
             # 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
           end
         end