Merge remote-tracking branch 'justin/master'

craigulliott · Feb 23, 2012 · fd3f5f1 · fd3f5f1
2 parents d77b899 + 97d2969
commit fd3f5f1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/config/application.rb b/config/application.rb
@@ -4,9 +4,9 @@
 
 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)
+   Bundler.require(:default, :assets, Rails.env)
 end
 
 module CraigsAdmin

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -31,7 +31,7 @@
   # config.force_ssl = true
 
   # See everything in the log (default is :info)
-  config.log_level = :debug
+  #config.log_level = :debug
 
   # Use a different logger for distributed setups
   # config.logger = SyslogLogger.new

diff --git a/config/sphinx.yml b/config/sphinx.yml
@@ -1,2 +1,3 @@
 production:
   version: '1.10-beta'
+