From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 12 Feb 2008 21:14:58 +0000 (+0000)
Subject: Ported r1034 and r1140 from trunk.
X-Git-Tag: 0.6-stable~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7e9dd78de8b2cd4b44edea80ba853a91539cde7f;p=redmine.git

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 4b46bfe0e..82d2a33ec 100644
--- 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 45008d653..ece0370db 100644
--- 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 c93fc6350..2d6d73602 100644
--- 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