Commit Graph

4728 Commits

Author SHA1 Message Date
Eric Davis 85c7cfd0a7 Fix test on 1.9.2 postgres.
Multiple records were found and postgres was returning them in a different
order than what the test assumed.
2011-06-03 14:11:08 -07:00
Eric Davis 3b64c60bc0 Merge branch 'ticket/release-v2.0.0/444-scm-encoding' into release-v2.0.0 2011-06-03 11:01:21 -07:00
Eric Davis ba3ddee99d [#444] Remove extra variable 2011-06-03 10:50:16 -07:00
Eric Davis f518251d5f [#444] Fix Changeset#to_utf8 coding standards 2011-06-03 10:46:46 -07:00
Jean-Philippe Lang 0f7ae9b658 Fixed: Update of Subversion changesets broken by r3466 under Solaris (#5255).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3635 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:15:13 -07:00
Toshi MARUYAMA 6efba7b05d scm: use upcase to compare encoding name "UTF-8" in log converting.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5375 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:14:05 -07:00
Toshi MARUYAMA e19c56d61a scm: replace invalid utf-8 sequences in comments instead of stripping on Ruby 1.8.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5373 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:13:48 -07:00
Toshi MARUYAMA 0adf1a87b1 scm: code clean up app/models/changeset.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5371 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:12:38 -07:00
Toshi MARUYAMA 5511155674 scm: fix log converting error in Ruby 1.9 and add more tests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5370 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:12:23 -07:00
Toshi MARUYAMA 60b34ea29b scm: set empty log encoding UTF-8 in Ruby 1.9 and add tests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5368 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:12:09 -07:00
Toshi MARUYAMA 81bdbd77f7 scm: not use Iconv for log converting in Ruby 1.9 and fix tests fails in Ruby 1.9.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5367 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:11:49 -07:00
Eric Davis 7eb98dbd34 [#443] Fix failing tests on 1.9.2 due to an invalid fixture 2011-06-03 09:55:44 -07:00
Eric Davis 76c9a6682f Remove duplicated test 2011-06-03 09:15:46 -07:00
Eric Davis aa07982daa Fix an edge-edge case bug in journal_attributes_for_user with different users
In one case in a plugin (not able to reproduce in core) journal_attributes_for_user
would set the :user to something different than what's in updated_by thus assigning
the Journal to the wrong user.
2011-06-01 22:00:02 -07:00
Holger Just db3480bdb6 [#436] Fix test relying on trailing whitespace. 2011-05-31 09:59:19 +02:00
Eric Davis a428fa6068 Bumping version to 2.0.0RC1 2011-05-30 14:22:31 -07:00
Eric Davis 821d9f5ca4 [#437] Move the encoding to the top of pdf.rb for Ruby 1.9 2011-05-30 14:20:20 -07:00
Eric Davis 790bb362c5 Fix the merge conflict from 6b8897db5f 2011-05-30 14:05:40 -07:00
Holger Just 6b8897db5f Merge branch 'unstable' into release-v2.0.0 2011-05-30 21:25:11 +02:00
Holger Just 12e29be604 Merge branch 'issues/unstable/436-trailing-whitespace' into unstable 2011-05-30 21:18:48 +02:00
Holger Just 07185fb169 [#436] Remove trailing whitespace 2011-05-30 20:52:25 +02:00
Holger Just b72785b274 [#436] Adapt rake task to also clean trailing whitespace 2011-05-30 20:49:58 +02:00
Holger Just 40ce66d05d [#197] Better regex and no trailing whitespace. 2011-05-30 19:58:54 +02:00
Eric Davis 37f6b75749 Added VERSION.special to handle special version releases (RC, distributions, etc) 2011-05-29 17:59:51 -07:00
Eric Davis e68a869d2d Update RUNNING_TESTS.rdoc to point to a wiki page 2011-05-29 17:42:49 -07:00
Eric Davis cfe2483e13 Update CHANGELOG for 2.0.0 2011-05-29 17:40:45 -07:00
Eric Davis ec3717e644 Merge branch 'ticket/unstable/197-copyright' into unstable 2011-05-29 13:44:34 -07:00
Eric Davis 99507a0391 [#197] Upgrade the copyright in the code files 2011-05-29 13:11:52 -07:00
Eric Davis f18090891f [#197] Add a rake task to update the copyright in code files 2011-05-29 13:11:37 -07:00
Eric Davis e131c3b531 [#197] Remove old copyrights 2011-05-29 12:50:08 -07:00
Eric Davis 36f34887f3 [#197] Fix up main copyright files 2011-05-29 12:10:31 -07:00
Eric Davis 96298eac64 Merge branch 'ticket/unstable/262-line-endings' into unstable 2011-05-29 12:00:33 -07:00
Eric Davis a85b6780d2 [#262] Convert line endings to UNIX 2011-05-29 12:00:18 -07:00
Eric Davis 05a4c4616f [#262] Add a rake task to convert line endings to UNIX 2011-05-29 11:59:57 -07:00
Eric Davis bc249871a6 [#407] Remove deferred Journal#visible tests 2011-05-29 11:11:26 -07:00
Eric Davis 8b06e26059 [#350] Force clearing the cache before each test 2011-05-27 15:52:24 -07:00
Eric Davis 5a9ffe9627 Merge branch 'feature/350-use_rails_cache_for_settings_cache' into unstable 2011-05-27 15:00:08 -07:00
Eric Davis e4fac8d40f [#350] Refactor: extract method 2011-05-27 14:59:42 -07:00
Eric Davis 9e1b6c14c8 [#345] Remove BigDecimal patch since Rails 2.3.11 includes a mitigation 2011-05-27 14:37:10 -07:00
Eric Davis 9baa310486 Fixed test by replacing assert_tag with assert_select 2011-05-27 14:16:38 -07:00
Eric Davis b95c526151 Fix failing test: RepositoryMercurialTest#test_activities 2011-05-27 14:08:18 -07:00
Eric Davis cd64d11e17 Merge branch 'master' into unstable
Conflicts:
	app/controllers/watchers_controller.rb
	app/views/issues/_action_menu.rhtml
	config/locales/pt-BR.yml
	doc/CHANGELOG.rdoc
	lib/redmine/export/pdf.rb
	lib/redmine/wiki_formatting/textile/helper.rb
2011-05-27 12:20:04 -07:00
Eric Davis 44b1bcfa37 Merge branch 'release-v1.4.0' 2011-05-27 11:41:22 -07:00
Eric Davis 0e31482de9 Bump version to 1.4.0 2011-05-27 11:37:03 -07:00
Eric Davis f6454629f2 Update Changelog for release 1.4.0 2011-05-27 11:22:49 -07:00
Eric Davis 46f66add1f Merge remote-tracking branch 'schmidt/f/416-redo-watcher-links-unstable' into unstable 2011-05-27 10:42:53 -07:00
Tom Kersten ce8bb652c6 [#423] Removed explicit render in WikiController#show
* Allows for format extensions in plugins w/o giving a double-render
  error
* Updated Wiki#show template to specify 'wiki/sidebar' explicitly
  (vs. just 'sidebar')
2011-05-27 10:20:45 -07:00
Eric Davis 762cc04b70 Port 784bbccf's custom value test back into aaj 2011-05-27 10:16:47 -07:00
Eric Davis f883758c95 Fix test: Search results are showing this as an issue-edit event 2011-05-27 10:15:49 -07:00
Eric Davis e9676954be Fix tpyo in the example 2011-05-27 09:28:45 -07:00