comparison config/.svn/text-base/environment.rb.svn-base @ 210:0579821a129a

Update to Redmine trunk rev 4802
author Chris Cannam
date Tue, 08 Feb 2011 13:51:46 +0000
parents 513646585e45
children 051f544170fe
comparison
equal deleted inserted replaced
128:07fa8a8b56a8 210:0579821a129a
44 # Use Active Record's schema dumper instead of SQL when creating the test database 44 # Use Active Record's schema dumper instead of SQL when creating the test database
45 # (enables use of different database adapters for development and test environments) 45 # (enables use of different database adapters for development and test environments)
46 # config.active_record.schema_format = :ruby 46 # config.active_record.schema_format = :ruby
47 47
48 # Deliveries are disabled by default. Do NOT modify this section. 48 # Deliveries are disabled by default. Do NOT modify this section.
49 # Define your email configuration in email.yml instead. 49 # Define your email configuration in configuration.yml instead.
50 # It will automatically turn deliveries on 50 # It will automatically turn deliveries on
51 config.action_mailer.perform_deliveries = false 51 config.action_mailer.perform_deliveries = false
52 52
53 config.gem 'rubytree', :lib => 'tree' 53 config.gem 'rubytree', :lib => 'tree'
54 config.gem 'coderay', :version => '~>0.9.7'
54 55
55 # Load any local configuration that is kept out of source control 56 # Load any local configuration that is kept out of source control
56 # (e.g. gems, patches). 57 # (e.g. gems, patches).
57 if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb')) 58 if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
58 instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb')) 59 instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))