Merge branch 'master' into unstable

Conflicts:
	app/models/journal_observer.rb
	lib/chili_project/version.rb
	test/unit/principal_drop_test.rb
This commit is contained in:
Holger Just 2012-02-06 23:56:33 +01:00
commit 1eefd4b40d
1 changed files with 6 additions and 1 deletions

View File

@ -43,11 +43,16 @@ Feature #809: Bulk add and search for projects when adding a member
* Feature #747: Include capybara for integration tests
* Feature #760: Update quick search to use a partial
== to-be-released v2.7.0
== 2012-02-06 v2.7.0
* Bug #593: Notification Mail for Wiki-Changes has wrong Diff
* Bug #775: Activity view too verbose
* Bug #819: RAILS_ENV is not properly set if running under thin
* Bug #822: Initial journal creation fails because of the missing log_encoding of Repositories
* Bug #823: Plugin in new directory not picking up Gemfile
* Bug #839: ruby-debug19 breaks on Ruby 1.9.3
* Bug #849: Prefix parameter of thin is not working
* Bug #857: Gemfile has an non ASCII character
== 2012-01-03 v2.6.0