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

..

exemplars

Use Object#tap instead of #returning (#6887).

2010-11-14 16:24:21 +00:00

fixtures

Port 784bbccf's custom value test back into aaj

2011-05-27 10:16:47 -07:00

functional

Merge branch 'master' into unstable

2011-05-27 12:20:04 -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 remote-tracking branch 'schmidt/f/416-redo-watcher-links-unstable' into unstable

2011-05-27 10:42:53 -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