diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-10-26 03:44:41 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-26 03:44:41 +0900 |
| commit | 802678d3dc27f1659c7bbdc5c0bbb86af2b25349 (patch) | |
| tree | 89ea6c9257d9165882cca5e69269ee4e10aa94f7 | |
| parent | 07ee01c153865a0cdfad9068b096bf5c4443c396 (diff) | |
| parent | 0bf8d1e4a607611ff7eaeb88a5c73804d6b4d8f3 (diff) | |
| download | rails-802678d3dc27f1659c7bbdc5c0bbb86af2b25349.tar.gz rails-802678d3dc27f1659c7bbdc5c0bbb86af2b25349.tar.bz2 rails-802678d3dc27f1659c7bbdc5c0bbb86af2b25349.zip | |
Merge pull request #30813 from y-yagi/remove_unused_secrets_yml
Remove unused `secrets.yml` template
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/secrets.yml | 32 |
2 files changed, 0 insertions, 36 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 39ef0d62de..46954f64b5 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -509,10 +509,6 @@ module Rails end end - def app_secret - SecureRandom.hex(64) - end - def mysql_socket @mysql_socket ||= [ "/tmp/mysql.sock", # default diff --git a/railties/lib/rails/generators/rails/app/templates/config/secrets.yml b/railties/lib/rails/generators/rails/app/templates/config/secrets.yml deleted file mode 100644 index ea9d47396c..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/config/secrets.yml +++ /dev/null @@ -1,32 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key is used for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! - -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -# You can use `rails secret` to generate a secure secret key. - -# Make sure the secrets in this file are kept private -# if you're sharing your code publicly. - -# Shared secrets are available across all environments. - -# shared: -# api_key: a1B2c3D4e5F6 - -# Environmental secrets are only available for that specific environment. - -development: - secret_key_base: <%= app_secret %> - -test: - secret_key_base: <%= app_secret %> - -# Do not keep production secrets in the unencrypted secrets file. -# Instead, either read values from the environment. -# Or, use `bin/rails secrets:setup` to configure encrypted secrets -# and move the `production:` environment over there. - -production: - secret_key_base: <%%= ENV["SECRET_KEY_BASE"] %> |