Merge branch 'release-v2.0.0' into unstable

Merging during the release to make sure everything is passing in CI,
which isn't set up to test release branches.

app/models/changeset.rb

@@ -239,28 +239,45 @@ class Changeset < ActiveRecord::Base
   private
 
   def self.to_utf8(str, encoding)
-    return str if str.blank?
+    return str if str.nil?
-    unless encoding.blank? || encoding == 'UTF-8'
+    str.force_encoding("ASCII-8BIT") if str.respond_to?(:force_encoding)
-      begin
+    if str.empty?
-        str = Iconv.conv('UTF-8', encoding, str)
+      str.force_encoding("UTF-8") if str.respond_to?(:force_encoding)
-      rescue Iconv::Failure
+      return str
-        # do nothing here
-      end
     end
+    normalized_encoding = encoding.blank? ? "UTF-8" : encoding
     if str.respond_to?(:force_encoding)
-      str.force_encoding('UTF-8')
+      if normalized_encoding.upcase != "UTF-8"
-      if ! str.valid_encoding?
+        str.force_encoding(normalized_encoding)
-        str = str.encode("US-ASCII", :invalid => :replace,
+        str = str.encode("UTF-8", :invalid => :replace,
-              :undef => :replace, :replace => '?').encode("UTF-8")
+              :undef => :replace, :replace => '?')
+      else
+        str.force_encoding("UTF-8")
+        unless str.valid_encoding?
+          str = str.encode("US-ASCII", :invalid => :replace,
+                :undef => :replace, :replace => '?').encode("UTF-8")
+        end
       end
     else
-      # removes invalid UTF8 sequences
+      
+      txtar = ""
       begin
-        str = Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + '  ')[0..-3]
+        txtar += Iconv.new('UTF-8', normalized_encoding).iconv(str)
-      rescue Iconv::InvalidEncoding
+      rescue Iconv::IllegalSequence
-        # "UTF-8//IGNORE" is not supported on some OS
+        txtar += $!.success
+        str = '?' + $!.failed[1,$!.failed.length]
+        retry
+      rescue
+        txtar += $!.success
       end
+      str = txtar
+    end
+    # removes invalid UTF8 sequences
+    begin
+      Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + '  ')[0..-3]
+    rescue Iconv::InvalidEncoding
+      # "UTF-8//IGNORE" is not supported on some OS
+      str
     end
-    str
   end
 end

doc/CHANGELOG.rdoc

@@ -2,22 +2,62 @@
 
 == TBD v2.0.0
 
+* Bug #262: Fix line endings
+* Bug #341: Remove English strings from RepositoriesHelper
+* Bug #343: Review Gantt and Calender links from 07cf681
+* Bug #345: Entering large numbers for 'Estimated Time' fails with 'Invalid big Decimal Value'
+* Bug #346: I18n YAML files not parsable with psych yaml library
+* Bug #383: Fix broken tests in unstable
+* Bug #389: Context menu doesn't work in Opera
+* Bug #390: mysql2 incompatibility in WikiPage model
+* Bug #400: Review and fix the Activity event types
+* Bug #401: Move JournalsHelpers from aaj to the core
+* Bug #403: [AAJ] Attachment has it's files and documents activity provider removed but only documents added
+* Bug #404: Move aaj/app/* to core
+* Bug #405: Move aaj/test/* to core
+* Bug #406: Check for missing Journal code from the AAJ merge
+* Bug #407: Add Journal#visible
+* Bug #408: Check IssueTest#test_saving_twice_should_not_duplicate_journal_details
+* Bug #409: [AAJ] Check that bugfix 784bbccf was merged
+* Bug #411: Issue Notes Preview
+* Bug #412: Test errors on 1.9.2 after acts_as_journalized merge
+* Bug #413: Test errors on 1.8.6 after acts_as_journalized merge
+* Bug #414: Remove returning since it causes deprecation warnings
+* Bug #415: Wikipages don't store/show the comment correctly
+* Bug #419: Issue list context menu not working in IE9
+* Bug #422: cvs test are not working
+* Bug #423: Remove explicit render from WikiController#show
+* Feature #112: Provide a library function to detect the database type used
+* Feature #196: Upgrade to Rails 2.3-latest
+* Feature #216: Remove the rubygems hack from boot.rb
+* Feature #217: Remove the hack to require a specific i18n version in boot.rb
+* Feature #269: Refactor lib/redmine/menu_manager.rb to increase extensibility
+* Feature #279: Optional start date on Versions
+* Feature #289: Switch to helper :all
+* Feature #290: Add bundler
+* Feature #310: Option to skip mail notifications on issue updates
+* Feature #350: Setting model should use Rails.cache instead of class variable
+* Feature #416: Refactor watcher_tag and watcher_link to use css selectors for the replace action
+* Task #123: Review and Merge acts_as_journalized
+* Task #197: Rake task to manage copyright inside of source files
+* Task #288: Review latest Redmine commits
+* Task #291: Update documentation to phase out Ruby 1.8.6
 * From Redmine v1.1.2
-* Defect #3132: Bulk editing menu non-functional in Opera browser
+** Defect #3132: Bulk editing menu non-functional in Opera browser
-* Defect #6090: Most binary files become corrupted when downloading from CVS repository browser when Redmine is running on a Windows server
+** Defect #6090: Most binary files become corrupted when downloading from CVS repository browser when Redmine is running on a Windows server
-* Defect #7280: Issues subjects wrap in Gantt
+** Defect #7280: Issues subjects wrap in Gantt
-* Defect #7288: Non ASCII filename downloaded from repo is broken on Internet Explorer.
+** Defect #7288: Non ASCII filename downloaded from repo is broken on Internet Explorer.
-* Defect #7317: Gantt tab gives internal error due to nil avatar icon
+** Defect #7317: Gantt tab gives internal error due to nil avatar icon
-* Defect #7497: Aptana Studio .project file added to version 1.1.1-stable
+** Defect #7497: Aptana Studio .project file added to version 1.1.1-stable
-* Defect #7611: Workflow summary shows X icon for workflow with exactly 1 status transition
+** Defect #7611: Workflow summary shows X icon for workflow with exactly 1 status transition
-* Defect #7625: Syntax highlighting unavailable from board new topic or topic edit preview
+** Defect #7625: Syntax highlighting unavailable from board new topic or topic edit preview
-* Defect #7630: Spent time in commits not recognized
+** Defect #7630: Spent time in commits not recognized
-* Defect #7656: MySQL SQL Syntax Error when filtering issues by Assignee's Group
+** Defect #7656: MySQL SQL Syntax Error when filtering issues by Assignee's Group
-* Defect #7718: Minutes logged in commit message are converted to hours
+** Defect #7718: Minutes logged in commit message are converted to hours
-* Defect #7763: Email notification are sent to watchers even if 'No events' setting is chosen
+** Defect #7763: Email notification are sent to watchers even if 'No events' setting is chosen
-* Feature #7608: Add "retro" gravatars
+** Feature #7608: Add "retro" gravatars
-* Patch #7598: Extensible MailHandler
+** Patch #7598: Extensible MailHandler
-* Patch #7795: Internal server error at journals#index with custom fields
+** Patch #7795: Internal server error at journals#index with custom fields
 
 == 2011-05-27 v1.4.0
 

doc/RUNNING_TESTS.rdoc

@@ -1,31 +1,3 @@
-= Installing gems for testing
+= Testing ChiliProject
 
-Run `rake gems RAILS_ENV=test` to list the required gems.  Run 
+The detailed upgrade instructions are located on the {official website}[https://www.chiliproject.org/projects/chiliproject/wiki/Testing]
-`rake gems:install RAILS_ENV=test` to install any missing gems.
-
-== Running Tests
-
-Run `rake --tasks test` to see available tests.
-`rake test` will run the entire testsuite.
-
-Before running `rake test` you need to configure both development
-and test databases.
-
-== Creating test repositories
-
-ChiliProject supports a wide array of different version control systems.
-To test the support, a test repository needs to be created for each of those.
-
-Run `rake --tasks test:scm:setup` for a list of available test-repositories or
-run `rake test:scm:setup:all` to set up all of them
-
-== Creating a test ldap database
-
-ChiliProject supports using LDAP for user authentications.  To test LDAP
-with ChiliProject, load the LDAP export from test/fixtures/ldap/test-ldap.ldif
-into a testing LDAP server.  Test that the ldap server can be accessed
-at 127.0.0.1 on port 389.
-
-Setting up the test ldap server is beyond the scope of this documentation.
-The OpenLDAP project provides a simple LDAP implementation that should work
-good as a test server.

lib/redmine/version.rb

@@ -15,11 +15,26 @@ require 'rexml/document'
 
 module Redmine
   module VERSION #:nodoc:
-    MAJOR = 1
+    MAJOR = 2
-    MINOR = 4
+    MINOR = 0
     PATCH = 0
     TINY  = PATCH # Redmine compat
 
+    # Used by semver to define the special version (if any).
+    # A special version "satify but have a lower precedence than the associated
+    # normal version". So 2.0.0RC1 would be part of the 2.0.0 series but
+    # be considered to be an older version.
+    #
+    #   1.4.0 < 2.0.0RC1 < 2.0.0RC2 < 2.0.0 < 2.1.0
+    #
+    # This method may be overridden by third party code to provide vendor or
+    # distribution specific versions. They may or may not follow semver.org:
+    #
+    #   2.0.0debian-2
+    def self.special
+      'RC1'
+    end
+    
     def self.revision
       revision = nil
       entries_path = "#{RAILS_ROOT}/.svn/entries"
@@ -48,7 +63,7 @@ module Redmine
     def self.to_a; ARRAY end
     def self.to_s; STRING end
     def self.to_semver
-      [MAJOR, MINOR, PATCH].join('.')
+      [MAJOR, MINOR, PATCH].join('.') + special
     end
   end
 end

test/fixtures/journals.yml

@@ -37,7 +37,7 @@ journals_003:
   journaled_id: 2
   changes: |
     ---
-    custom_values_2:
+    custom_values2:
     - 'Old value'
     - 'New value'
 journals_004:

test/functional/issues_controller_test.rb

@@ -632,17 +632,6 @@ class IssuesControllerTest < ActionController::TestCase
         assert_equal IssueStatus.default, issue.status
       end
 
-      should "accept default status" do
-        assert_difference 'Issue.count' do
-          post :create, :project_id => 1,
-                     :issue => {:tracker_id => 1,
-                                :subject => 'This is an issue',
-                                :status_id => 1}
-        end
-        issue = Issue.last(:order => 'id')
-        assert_equal IssueStatus.default, issue.status
-      end
-
       should "ignore unauthorized status" do
         assert_difference 'Issue.count' do
           post :create, :project_id => 1,

test/unit/changeset_test.rb

@@ -14,7 +14,9 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 class ChangesetTest < ActiveSupport::TestCase
-  fixtures :projects, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :users, :members, :member_roles, :trackers
+  fixtures :projects, :repositories, :issues, :issue_statuses,
+           :changesets, :changes, :issue_categories, :enumerations,
+           :custom_fields, :custom_values, :users, :members, :member_roles, :trackers
 
   def setup
   end
@@ -235,32 +237,49 @@ class ChangesetTest < ActiveSupport::TestCase
       assert_equal "Texte encodé en ISO-8859-1.", c.comments
   end
 
-  def test_invalid_utf8_sequences_in_comments_should_be_stripped
+  def test_invalid_utf8_sequences_in_comments_should_be_replaced_latin1
       proj = Project.find(3)
       str = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
       r = Repository::Bazaar.create!(
-            :project => proj, :url => '/tmp/test/bazaar',
+            :project => proj,
+            :url => '/tmp/test/bazaar',
             :log_encoding => 'UTF-8' )
       assert r
-      c = Changeset.new(:repository => r,
+      c = Changeset.new(:repository   => r,
                         :committed_on => Time.now,
-                        :revision => '123',
+                        :revision     => '123',
-                        :scmid => '12345',
+                        :scmid        => '12345',
-                        :comments => str)
+                        :comments     => str)
       assert( c.save )
+      assert_equal "Texte encod? en ISO-8859-1.", c.comments
+  end
+
+  def test_invalid_utf8_sequences_in_comments_should_be_replaced_ja_jis
+      proj = Project.find(3)
+      str = "test\xb5\xfetest\xb5\xfe"
       if str.respond_to?(:force_encoding)
-        assert_equal "Texte encod? en ISO-8859-1.", c.comments
+        str.force_encoding('ASCII-8BIT')
-      else
-        assert_equal "Texte encod en ISO-8859-1.", c.comments
       end
+      r = Repository::Bazaar.create!(
+            :project => proj,
+            :url     => '/tmp/test/bazaar',
+            :log_encoding => 'ISO-2022-JP' )
+      assert r
+      c = Changeset.new(:repository   => r,
+                        :committed_on => Time.now,
+                        :revision     => '123',
+                        :scmid        => '12345',
+                        :comments     => str)
+      assert( c.save )
+      assert_equal "test??test??", c.comments
   end
 
   def test_comments_should_be_converted_all_latin1_to_utf8
       s1 = "\xC2\x80"
       s2 = "\xc3\x82\xc2\x80"
+      s4 = s2.dup
       if s1.respond_to?(:force_encoding)
         s3 = s1.dup
-        s4 = s2.dup
         s1.force_encoding('ASCII-8BIT')
         s2.force_encoding('ASCII-8BIT')
         s3.force_encoding('ISO-8859-1')
@@ -278,7 +297,43 @@ class ChangesetTest < ActiveSupport::TestCase
                         :scmid => '12345',
                         :comments => s1)
       assert( c.save )
-      assert_equal s2, c.comments
+      assert_equal s4, c.comments
+  end
+
+  def test_comments_nil
+      proj = Project.find(3)
+      r = Repository::Bazaar.create!(
+            :project => proj, :url => '/tmp/test/bazaar',
+            :log_encoding => 'ISO-8859-1' )
+      assert r
+      c = Changeset.new(:repository => r,
+                        :committed_on => Time.now,
+                        :revision => '123',
+                        :scmid => '12345',
+                        :comments => nil)
+      assert( c.save )
+      assert_equal "", c.comments
+      if c.comments.respond_to?(:force_encoding)
+        assert_equal "UTF-8", c.comments.encoding.to_s
+      end
+  end
+
+  def test_comments_empty
+      proj = Project.find(3)
+      r = Repository::Bazaar.create!(
+            :project => proj, :url => '/tmp/test/bazaar',
+            :log_encoding => 'ISO-8859-1' )
+      assert r
+      c = Changeset.new(:repository => r,
+                        :committed_on => Time.now,
+                        :revision => '123',
+                        :scmid => '12345',
+                        :comments => "")
+      assert( c.save )
+      assert_equal "", c.comments
+      if c.comments.respond_to?(:force_encoding)
+        assert_equal "UTF-8", c.comments.encoding.to_s
+      end
   end
 
   def test_identifier

test/unit/repository_test.rb

@@ -109,17 +109,13 @@ class RepositoryTest < ActiveSupport::TestCase
 
   def test_for_changeset_comments_strip
     repository = Repository::Mercurial.create( :project => Project.find( 4 ), :url => '/foo/bar/baz' )
-    comment = <<-COMMENT
+    comment = "This is a looooooooooooooong comment" + (" " * 80 + "\n") * 5
-    This is a loooooooooooooooooooooooooooong comment
-
-
-    COMMENT
     changeset = Changeset.new(
       :comments => comment, :commit_date => Time.now, :revision => 0, :scmid => 'f39b7922fb3c',
       :committer => 'foo <foo@example.com>', :committed_on => Time.now, :repository => repository )
     assert( changeset.save )
     assert_not_equal( comment, changeset.comments )
-    assert_equal( 'This is a loooooooooooooooooooooooooooong comment', changeset.comments )
+    assert_equal( 'This is a looooooooooooooong comment', changeset.comments )
   end
 
   def test_for_urls_strip

vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/creation.rb

@@ -120,8 +120,8 @@ module Redmine::Acts::Journalized
         def journal_attributes
           attributes = { :journaled_id => self.id, :activity_type => activity_type, 
             :changes => journal_changes, :version => last_version + 1,
-            :notes => journal_notes, :user_id => (journal_user.try(:id) || User.current) }
+            :notes => journal_notes, :user_id => (journal_user.try(:id) || User.current.try(:id)) }
         end
     end
   end
-end
+end

vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/users.rb

@@ -57,7 +57,7 @@ module Redmine::Acts::Journalized
         # Overrides the +journal_attributes+ method to include user information passed into the
         # parent object, by way of a +updated_by+ attr_accessor.
         def journal_attributes_with_user
-          journal_attributes_without_user.merge(:user => updated_by || User.current)
+          journal_attributes_without_user.merge(:user_id => updated_by.try(:id) || User.current.try(:id))
         end
     end