Tim Felgentreff 4b098d7774 Merge branch 'journals' into 1.0-stable ...

Conflicts:
	app/controllers/issues_controller.rb
	app/controllers/journals_controller.rb
	app/helpers/journals_helper.rb
	app/views/issues/_history.rhtml
	lib/redmine/activity/fetcher.rb
	test/functional/issues_controller_test.rb
	test/test_helper.rb

2010-09-14 09:32:35 +02:00

..

environments

Pin shoulda, 2.11.x changes it's API and deprecates a lot of macros.

2010-06-19 19:01:53 +00:00

initializers

Rails 2.3.5 deprecation.

2009-12-23 20:55:42 +00:00

locales

Merged r4008 from trunk.

2010-08-22 19:48:57 +00:00

additional_environment.rb.example

Allow a config/additional_environment.rb file to customize the Rails::Initializer.

2009-11-08 02:16:42 +00:00

boot.rb

Upgraded to Rails 2.3.4 (#3597)

2009-09-13 17:14:35 +00:00

database.yml.example

Cleanup and warning added in database.yml.database about the test database.

2010-03-12 13:48:14 +00:00

email.yml.example

Added some common example email configs to email.yml.example (#3120)

2010-02-18 05:20:52 +00:00

environment.rb

move (almost) everything over to acts_as_journalized

2010-07-15 18:24:12 +02:00

routes.rb

Merged r4006 from trunk.

2010-08-22 19:48:45 +00:00

settings.yml

Merged r4013 from trunk.

2010-08-22 19:49:26 +00:00