aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application
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/application
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/application')
-rw-r--r--railties/lib/rails/application/configuration.rb2
1 files changed, 1 insertions, 1 deletions
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"