aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-20 20:48:19 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-20 20:48:19 -0200
commita56db55e39781dd700555f784d230aff2dd1f714 (patch)
treeb21ca15b134ebacf5d5b64b44197bb630435c605 /railties
parent14a6e179282010c62f87311f168fcb6a04a8b5ee (diff)
parent027d484f1d0c77855c09099091f7c3b5c976a7c0 (diff)
downloadrails-a56db55e39781dd700555f784d230aff2dd1f714.tar.gz
rails-a56db55e39781dd700555f784d230aff2dd1f714.tar.bz2
rails-a56db55e39781dd700555f784d230aff2dd1f714.zip
Merge branch 'dilizarov-feature/alias_request_uuid_method_to_request_id'
Fixes #16518
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt2
1 files changed, 1 insertions, 1 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 75666d20c5..8c09396fc1 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
@@ -48,7 +48,7 @@ Rails.application.configure do
config.log_level = :debug
# Prepend all log lines with the following tags.
- # config.log_tags = [ :subdomain, :uuid ]
+ # config.log_tags = [ :subdomain, :request_id ]
# Use a different logger for distributed setups.
# config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)