use a controller method to handle cancan denials

[rails.git] / config / environments / production.rb

diff --git a/config/environments/production.rb b/config/environments/production.rb
index e421abc58a82be4b7d8a266929e8767eedafa9cb..56bd2288109d56ce6bf6fcebf2cfa7f1152b266c 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -14,6 +14,11 @@ Rails.application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
+  # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
+  # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
+  # `config/secrets.yml.key`.
+  config.read_encrypted_secrets = true
+
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
   config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
@@ -57,7 +62,7 @@ Rails.application.configure do
 
   # Use a real queuing backend for Active Job (and separate queues per environment)
   # config.active_job.queue_adapter     = :resque
-  # config.active_job.queue_name_prefix = "rails50_#{Rails.env}"
+  # config.active_job.queue_name_prefix = "openstreetmap_#{Rails.env}"
   config.action_mailer.perform_caching = false
 
   # Configure caching of static assets
@@ -88,9 +93,7 @@ Rails.application.configure do
   end
 
   # Do not dump schema after migrations.
-  unless STATUS == :database_offline
-    config.active_record.dump_schema_after_migration = false
-  end
+  config.active_record.dump_schema_after_migration = false unless STATUS == :database_offline
 
   # Enable autoloading of dependencies.
   config.enable_dependency_loading = true