Merge branch 'develop'5.1-beta1

1 files changed, 8 insertions, 7 deletions

diff --git a/config/application.rb b/config/application.rb
index d09cf24..ad58092 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
@@ -17,23 +17,24 @@ module Gemeinschaft42c
 
     # Custom directories with classes and modules you want to be autoloadable.
     # config.autoload_paths += %W(#{config.root}/extras)
+    config.autoload_paths += %W(#{config.root}/lib)
 
     # 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 +59,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