diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-11-10 21:22:11 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-11-10 21:22:11 -0200 |
| commit | 99dccf1aae31520b701fc37e62542db1e6c0994f (patch) | |
| tree | 8150e2fcc49c7b1a778164aaf71fe584b0136fa1 /guides | |
| parent | 0ed6ebcf9095c65330d3950cfb6b75ba7ea78853 (diff) | |
| parent | bda93b2bb272c34e46a5454d4658a0139b135e93 (diff) | |
| download | rails-99dccf1aae31520b701fc37e62542db1e6c0994f.tar.gz rails-99dccf1aae31520b701fc37e62542db1e6c0994f.tar.bz2 rails-99dccf1aae31520b701fc37e62542db1e6c0994f.zip | |
Merge branch 'rm-fix-secret-token-fallback'
Diffstat (limited to 'guides')
| -rw-r--r-- | guides/bug_report_templates/action_controller_gem.rb | 4 | ||||
| -rw-r--r-- | guides/bug_report_templates/action_controller_master.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/guides/bug_report_templates/action_controller_gem.rb b/guides/bug_report_templates/action_controller_gem.rb index 9387e3dc1d..1f0cec1e22 100644 --- a/guides/bug_report_templates/action_controller_gem.rb +++ b/guides/bug_report_templates/action_controller_gem.rb @@ -7,8 +7,8 @@ require 'action_controller/railtie' class TestApp < Rails::Application config.root = File.dirname(__FILE__) config.session_store :cookie_store, key: 'cookie_store_key' - config.secret_token = 'secret_token' - config.secret_key_base = 'secret_key_base' + secrets.secret_token = 'secret_token' + secrets.secret_key_base = 'secret_key_base' config.logger = Logger.new($stdout) Rails.logger = config.logger diff --git a/guides/bug_report_templates/action_controller_master.rb b/guides/bug_report_templates/action_controller_master.rb index 20c64b4a85..0e51eaa0db 100644 --- a/guides/bug_report_templates/action_controller_master.rb +++ b/guides/bug_report_templates/action_controller_master.rb @@ -19,8 +19,8 @@ require 'action_controller/railtie' class TestApp < Rails::Application config.root = File.dirname(__FILE__) config.session_store :cookie_store, key: 'cookie_store_key' - config.secret_token = 'secret_token' - config.secret_key_base = 'secret_key_base' + secrets.secret_token = 'secret_token' + secrets.secret_key_base = 'secret_key_base' config.logger = Logger.new($stdout) Rails.logger = config.logger |