aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-12-12 14:58:53 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-12-12 17:05:52 -0500
commitbb7537bc872e0a724fa97468e5899de0c70c1fc1 (patch)
tree3d6c08175b1835c317f5e83a26b368eae178873c /railties/lib/rails/generators
parent39fd0be7660e2f666328af85c705c3df5a8ac09e (diff)
downloadrails-bb7537bc872e0a724fa97468e5899de0c70c1fc1.tar.gz
rails-bb7537bc872e0a724fa97468e5899de0c70c1fc1.tar.bz2
rails-bb7537bc872e0a724fa97468e5899de0c70c1fc1.zip
Rename tokens.yml to secrets.yml
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb2
-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
2 files changed, 1 insertions, 1 deletions
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