Eric Davis 216619d376 Merge branch 'unstable' into ticket/unstable/123-journalized ... Conflicts: test/unit/journal_test.rb vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/permissions.rb		2011-05-13 10:35:23 -07:00
..
exemplars	Use Object#tap instead of #returning (#6887).	2010-11-14 16:24:21 +00:00
fixtures	Merge acts_as_journalized to unstable. #123	2011-04-23 21:25:52 +02:00
functional	Merge branch 'unstable' into ticket/unstable/123-journalized	2011-05-13 10:35:23 -07:00
integration	Merge branch 'unstable' into ticket/unstable/123-journalized	2011-05-13 10:35:23 -07:00
mocks	Adding OpenID mock and test. #699	2009-02-11 19:07:18 +00:00
unit	Merge branch 'unstable' into ticket/unstable/123-journalized	2011-05-13 10:35:23 -07: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 acts_as_journalized to unstable. #123	2011-04-23 21:25:52 +02:00