[DRE-commits] r4453 - in trunk/redmine/debian: . patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2009-12-13 00:07:26 +0000 (Sun, 13 Dec 2009)
New Revision: 4453

Modified:
   trunk/redmine/debian/changelog
   trunk/redmine/debian/patches/revert_rails_2.3.patch
Log:
Upstream update.

Modified: trunk/redmine/debian/changelog
===================================================================
--- trunk/redmine/debian/changelog	2009-12-13 00:07:18 UTC (rev 4452)
+++ trunk/redmine/debian/changelog	2009-12-13 00:07:26 UTC (rev 4453)
@@ -1,4 +1,4 @@
-redmine (0.9.0~svn3111-1) UNRELEASED; urgency=low
+redmine (0.9.0~svn3126-1) UNRELEASED; urgency=low
 
   * Upstream update.
   * Stop using deprecated dbfile param in database.yml.

Modified: trunk/redmine/debian/patches/revert_rails_2.3.patch
===================================================================
--- trunk/redmine/debian/patches/revert_rails_2.3.patch	2009-12-13 00:07:18 UTC (rev 4452)
+++ trunk/redmine/debian/patches/revert_rails_2.3.patch	2009-12-13 00:07:26 UTC (rev 4453)
@@ -288,28 +288,6 @@
        diff_type = options[:type] || 'inline'
        
        lines = 0
-diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
-index 4c6b253..2b6d159 100644
---- a/test/functional/issues_controller_test.rb
-+++ b/test/functional/issues_controller_test.rb
-@@ -178,7 +178,7 @@ class IssuesControllerTest < ActionController::TestCase
-     assert_template 'index.rhtml'
-     assert_not_nil assigns(:issues)
-     count_by_group = assigns(:issue_count_by_group)
--    assert_kind_of Hash, count_by_group
-+    assert_kind_of ActiveSupport::OrderedHash, count_by_group
-     assert_kind_of Tracker, count_by_group.keys.first
-     assert_not_nil count_by_group[Tracker.find(1)]
-   end
-@@ -189,7 +189,7 @@ class IssuesControllerTest < ActionController::TestCase
-     assert_template 'index.rhtml'
-     assert_not_nil assigns(:issues)
-     count_by_group = assigns(:issue_count_by_group)
--    assert_kind_of Hash, count_by_group
-+    assert_kind_of ActiveSupport::OrderedHash, count_by_group
-     assert_kind_of String, count_by_group.keys.first
-     assert_not_nil count_by_group['MySQL']
-   end
 diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
 index b8ff4f0..18a1cb8 100644
 --- a/test/unit/mailer_test.rb