From 9c23099b8f93e0ace47caba051204eb6624b8c95 Mon Sep 17 00:00:00 2001 From: "Mario \"Kuroir\" Ricalde" Date: Wed, 16 Jan 2013 02:45:18 -0600 Subject: Updates Rails to 3.2.9 --- config/application.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'config') diff --git a/config/application.rb b/config/application.rb index d09cf24..776cf81 100644 --- a/config/application.rb +++ b/config/application.rb @@ -4,7 +4,7 @@ require 'rails/all' if defined?(Bundler) # If you precompile assets before deploying to production, use this line - Bundler.require *Rails.groups(:assets => %w(development test)) + Bundler.require(*Rails.groups(:assets => %w(development test))) # If you want your assets lazily compiled in production, use this line # Bundler.require(:default, :assets, Rails.env) end @@ -21,19 +21,19 @@ module Gemeinschaft42c # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named. # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - + # --- rather use Apache + Passenger for SSL -----{ #config.plugins = [ :exception_notification, :ssl_requirement, :all ] - + #config.middleware.insert_before ActionDispatch::Static, "Rack::SSL" #config.middleware.insert_before ActionDispatch::Static, Rack::SSL, :exclude => proc { |env| env['HTTPS'] != 'on' } #config.force_ssl = true - + #require 'rack/ssl' #config.middleware.use Rack::SSL # -----------------------------------------------} - - + + # Activate observers that should always be running. # config.active_record.observers = :cacher, :garbage_collector, :forum_observer @@ -58,7 +58,7 @@ module Gemeinschaft42c # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' - + # Load the PhoneControllers config.autoload_paths += %W(#{config.root}/lib/phone_controllers) end -- cgit v1.2.3