diff config/environment.rb @ 1338:25603efa57b5

Merge from live branch

--- a/config/environment.rb	Wed Jan 23 13:11:25 2013 +0000
+++ b/config/environment.rb	Thu Jun 20 13:14:14 2013 +0100
@@ -1,68 +1,14 @@
-# Be sure to restart your web server when you modify this file.
+# Load the rails application
+require File.expand_path('../application', __FILE__)
 
-# Uncomment below to force Rails into production mode when
-# you don't control web/app server and can't set it the proper way
-# ENV['RAILS_ENV'] ||= 'production'
-
-# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.15' unless defined? RAILS_GEM_VERSION
-
-if RUBY_VERSION >= '1.9'
-  Encoding.default_external = 'UTF-8'
+# Make sure there's no plugin in vendor/plugin before starting
+vendor_plugins_dir = File.join(Rails.root, "vendor", "plugins")
+if Dir.glob(File.join(vendor_plugins_dir, "*")).any?
+  $stderr.puts "Plugins in vendor/plugins (#{vendor_plugins_dir}) are no longer allowed. " +
+    "Please, put your Redmine plugins in the `plugins` directory at the root of your " +
+    "Redmine directory (#{File.join(Rails.root, "plugins")})"
+  exit 1
 end
 
-# Bootstrap the Rails environment, frameworks, and default configuration
-require File.join(File.dirname(__FILE__), 'boot')
-
-# Load Engine plugin if available
-begin
-  require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
-rescue LoadError
-  # Not available
-end
-
-Rails::Initializer.run do |config|
-  # Settings in config/environments/* take precedence those specified here
-
-  # Skip frameworks you're not going to use
-  # config.frameworks -= [ :action_web_service, :action_mailer ]
-
-  # Add additional load paths for sweepers
-  config.autoload_paths += %W( #{RAILS_ROOT}/app/sweepers )
-
-  # Force all environments to use the same logger level
-  # (by default production uses :info, the others :debug)
-  # config.log_level = :debug
-
-  # Enable page/fragment caching by setting a file-based store
-  # (remember to create the caching directory and make it readable to the application)
-  config.action_controller.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
-
-  # And for direct uses of the cache
-  config.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
-
-  # Activate observers that should always be running
-  # config.active_record.observers = :cacher, :garbage_collector
-  config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer, :comment_observer
-
-  # Make Active Record use UTC-base instead of local time
-  # config.active_record.default_timezone = :utc
-
-  # Use Active Record's schema dumper instead of SQL when creating the test database
-  # (enables use of different database adapters for development and test environments)
-  # config.active_record.schema_format = :ruby
-
-  # Deliveries are disabled by default. Do NOT modify this section.
-  # Define your email configuration in configuration.yml instead.
-  # It will automatically turn deliveries on
-  config.action_mailer.perform_deliveries = false
-
-  config.gem 'rubytree', :lib => 'tree'
-  config.gem 'coderay', :version => '~>1.0.0'
-
-  # Load any local configuration that is kept out of source control
-  # (e.g. gems, patches).
-  if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
-    instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
-  end
-end
+# Initialize the rails application
+RedmineApp::Application.initialize!