diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-10 10:04:07 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-12 14:59:11 -0500 |
| commit | 3eaa29840b92813f37adcc41d3d8c08d976480a4 (patch) | |
| tree | c5544d6b8abcacb6fe04b2ce4eb259976c7f64e6 /railties/lib/rails/application | |
| parent | 0f4d235c1606ccec30e8fd0aeb4b88a061ee83fe (diff) | |
| download | rails-3eaa29840b92813f37adcc41d3d8c08d976480a4.tar.gz rails-3eaa29840b92813f37adcc41d3d8c08d976480a4.tar.bz2 rails-3eaa29840b92813f37adcc41d3d8c08d976480a4.zip | |
Load secret_key_base from tokens.yml, fallback to config.secret_key_base
Diffstat (limited to 'railties/lib/rails/application')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index dd0b9c6d70..f835ccceaa 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -76,6 +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/environment", with: "config/environment.rb" paths.add "lib/templates" paths.add "log", with: "log/#{Rails.env}.log" |