diff options
author | Grey Baker <greysteil@gmail.com> | 2017-05-15 12:17:36 +0100 |
---|---|---|
committer | Grey Baker <greysteil@gmail.com> | 2017-05-15 12:21:19 +0100 |
commit | 5830a69ed950d4d9231d1373ef595813819472a6 (patch) | |
tree | 7c21fe64c29e9e77e078a0eb03fbffc44d169da3 /railties/lib | |
parent | d48008f16438c2c9c9c7295f550568b82b95ef9e (diff) | |
download | rails-5830a69ed950d4d9231d1373ef595813819472a6.tar.gz rails-5830a69ed950d4d9231d1373ef595813819472a6.tar.bz2 rails-5830a69ed950d4d9231d1373ef595813819472a6.zip |
Better spacing in environments/production.rb file
Previously there were a couple of places where double-spacing or no spacing
was happening, depending on skipped options.
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index 9c4a77fd1d..d44331a888 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -36,8 +36,8 @@ Rails.application.configure do config.assets.compile = false # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb - <%- end -%> + <%- end -%> # Enable serving of images, stylesheets, and JavaScripts from an asset server. # config.action_controller.asset_host = 'http://assets.example.com' @@ -50,8 +50,8 @@ Rails.application.configure do # config.action_cable.mount_path = nil # config.action_cable.url = 'wss://example.com/cable' # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] - <%- end -%> + <%- end -%> # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # config.force_ssl = true @@ -68,14 +68,15 @@ 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 = "<%= app_name %>_#{Rails.env}" + <%- unless options.skip_action_mailer? -%> config.action_mailer.perform_caching = false # Ignore bad email addresses and do not raise email delivery errors. # Set this to true and configure the email server for immediate delivery to raise delivery errors. # config.action_mailer.raise_delivery_errors = false - <%- end -%> + <%- end -%> # Enable locale fallbacks for I18n (makes lookups for any locale fall back to # the I18n.default_locale when a translation cannot be found). config.i18n.fallbacks = true |