diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-11-30 11:42:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-30 11:42:44 -0500 |
| commit | 25c076117ce9bb3efcf686c110187206e428b96a (patch) | |
| tree | 1d4b3330e5c89dff6461542037f211dd56ff544c /railties/lib/rails/application.rb | |
| parent | b37f06c814c75fa29f67e237301256d2ec4ec015 (diff) | |
| parent | 264152af2b0c210b4c2e4865e337eaa07836c948 (diff) | |
| download | rails-25c076117ce9bb3efcf686c110187206e428b96a.tar.gz rails-25c076117ce9bb3efcf686c110187206e428b96a.tar.bz2 rails-25c076117ce9bb3efcf686c110187206e428b96a.zip | |
Merge pull request #33882 from mberlanda/mberlanda/as-inheritable-options-intialization
[Realties] config_for as ActiveSupport::OrderedOptions
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 656786246d..acd97b64bf 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -232,10 +232,12 @@ module Rails if yaml.exist? require "erb" - require "active_support/ordered_options" + config = YAML.load(ERB.new(yaml.read).result) || {} + config = (config["shared"] || {}).merge(config[env] || {}) - config = (YAML.load(ERB.new(yaml.read).result) || {})[env] || {} - ActiveSupport::InheritableOptions.new(config.deep_symbolize_keys) + ActiveSupport::OrderedOptions.new.tap do |config_as_ordered_options| + config_as_ordered_options.update(config.deep_symbolize_keys) + end else raise "Could not load configuration. No such file - #{yaml}" end |