diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-02-23 15:55:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-23 15:55:15 +0100 |
| commit | 039380e3eeb24ed17f1824183b94638f0cfff747 (patch) | |
| tree | 043922cdcb7298443aac11f594c412404a299fe9 /railties/lib/rails/application | |
| parent | 11660945696155c86a05260795e1a0afce0d291d (diff) | |
| download | rails-039380e3eeb24ed17f1824183b94638f0cfff747.tar.gz rails-039380e3eeb24ed17f1824183b94638f0cfff747.tar.bz2 rails-039380e3eeb24ed17f1824183b94638f0cfff747.zip | |
Revert "Add encrypted secrets" (#28127)
Diffstat (limited to 'railties/lib/rails/application')
| -rw-r--r-- | railties/lib/rails/application/bootstrap.rb | 6 | ||||
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb index 4223c38146..6102af3fff 100644 --- a/railties/lib/rails/application/bootstrap.rb +++ b/railties/lib/rails/application/bootstrap.rb @@ -2,7 +2,6 @@ require "fileutils" require "active_support/notifications" require "active_support/dependencies" require "active_support/descendants_tracker" -require "rails/secrets" module Rails class Application @@ -78,11 +77,6 @@ INFO initializer :bootstrap_hook, group: :all do |app| ActiveSupport.run_load_hooks(:before_initialize, app) end - - initializer :set_secrets_root, group: :all do - Rails::Secrets.root = root - Rails::Secrets.read_encrypted_secrets = config.read_encrypted_secrets - end end end end diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index b0592151b7..b0d33f87a3 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -13,8 +13,7 @@ module Rails :railties_order, :relative_url_root, :secret_key_base, :secret_token, :ssl_options, :public_file_server, :session_options, :time_zone, :reload_classes_only_on_change, - :beginning_of_week, :filter_redirect, :x, :enable_dependency_loading, - :read_encrypted_secrets + :beginning_of_week, :filter_redirect, :x, :enable_dependency_loading attr_writer :log_level attr_reader :encoding, :api_only @@ -52,7 +51,6 @@ module Rails @debug_exception_response_format = nil @x = Custom.new @enable_dependency_loading = false - @read_encrypted_secrets = false end def encoding=(value) @@ -82,7 +80,7 @@ module Rails @paths ||= begin paths = super paths.add "config/database", with: "config/database.yml" - paths.add "config/secrets", with: "config", glob: "secrets.yml{,.enc}" + 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" |