obsolete.ChilliProject/test
Tim Felgentreff 19c7dc0094 Merge remote branch 'edavis/master' into master-journalized
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/wiki_controller.rb
	app/helpers/issues_helper.rb
	app/models/time_entry.rb
	app/models/wiki_content.rb
	app/views/wiki/edit.rhtml
	config/locales/ja.yml
	test/functional/wiki_controller_test.rb
2010-10-26 18:28:39 +02:00
..
exemplars Added User#notify_about? to check when a user should be notified about an event 2010-09-28 18:22:10 +00:00
fixtures Merge branch 'master' into master-journalized 2010-10-26 18:20:57 +02:00
functional Merge remote branch 'edavis/master' into master-journalized 2010-10-26 18:28:39 +02:00
integration Merge remote branch 'edavis/master' into master-journalized 2010-10-26 18:28:39 +02:00
mocks Adding OpenID mock and test. #699 2009-02-11 19:07:18 +00:00
unit Merge remote branch 'edavis/master' into master-journalized 2010-10-26 18:28:39 +02:00
helper_testcase.rb Upgraded to Rails 2.3.4 (#3597) 2009-09-13 17:14:35 +00:00
object_daddy_helpers.rb Added a "Member of Role" to the issues filters. #5869 2010-09-10 19:44:45 +00:00
test_helper.rb Merge remote branch 'edavis/master' into master-journalized 2010-10-26 18:28:39 +02:00