diff options
| author | Leonel Galán <leonel@getstealz.com> | 2017-04-25 10:39:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 10:39:46 -0500 |
| commit | f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76 (patch) | |
| tree | 4afabfef205d5fbd546946a16bc6cf5eb36279e9 /railties/lib/rails/application/bootstrap.rb | |
| parent | 8648f289f01656b2258687126108c389127108e0 (diff) | |
| parent | b32d64df5e5160e25804c7019e2da76bd115f3a6 (diff) | |
| download | rails-f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76.tar.gz rails-f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76.tar.bz2 rails-f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76.zip | |
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to 'railties/lib/rails/application/bootstrap.rb')
| -rw-r--r-- | railties/lib/rails/application/bootstrap.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb index 4223c38146..dc0491035d 100644 --- a/railties/lib/rails/application/bootstrap.rb +++ b/railties/lib/rails/application/bootstrap.rb @@ -81,7 +81,6 @@ INFO initializer :set_secrets_root, group: :all do Rails::Secrets.root = root - Rails::Secrets.read_encrypted_secrets = config.read_encrypted_secrets end end end |