diff options
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/secrets.yml (renamed from railties/lib/rails/generators/rails/app/templates/config/tokens.yml) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 20e90737b0..06acb4c877 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -304,7 +304,7 @@ module Rails def secrets #:nodoc: @secrets ||= begin secrets = ActiveSupport::OrderedOptions.new - yaml = config.paths["config/tokens"].first + yaml = config.paths["config/secrets"].first if File.exist?(yaml) require "erb" env_secrets = YAML.load(ERB.new(IO.read(yaml)).result)[Rails.env] diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index f835ccceaa..9975bb8596 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -76,7 +76,7 @@ module Rails @paths ||= begin paths = super paths.add "config/database", with: "config/database.yml" - paths.add "config/tokens", with: "config/tokens.yml" + paths.add "config/secrets", with: "config/secrets.yml" paths.add "config/environment", with: "config/environment.rb" paths.add "lib/templates" paths.add "log", with: "log/#{Rails.env}.log" diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 2c4911cadc..e12ee3c713 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -78,7 +78,7 @@ module Rails template "routes.rb" template "application.rb" template "environment.rb" - template "tokens.yml" + template "secrets.yml" directory "environments" directory "initializers" diff --git a/railties/lib/rails/generators/rails/app/templates/config/tokens.yml b/railties/lib/rails/generators/rails/app/templates/config/secrets.yml index 3ce5de1dc9..3ce5de1dc9 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/tokens.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/secrets.yml |