diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-31 15:57:37 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-31 15:57:37 -0500 |
| commit | 90a8e0698db59d2f4ba137ea11c21783d6f9c66a (patch) | |
| tree | c7e4f0683a3949808bad4daa1e4feafd31bc800c /activestorage/lib/active_storage | |
| parent | 54663f55efd93c5e4f649fd1ad2833a853261507 (diff) | |
| download | rails-90a8e0698db59d2f4ba137ea11c21783d6f9c66a.tar.gz rails-90a8e0698db59d2f4ba137ea11c21783d6f9c66a.tar.bz2 rails-90a8e0698db59d2f4ba137ea11c21783d6f9c66a.zip | |
Use config/storage.yml as part of the skeleton and loading
Diffstat (limited to 'activestorage/lib/active_storage')
| -rw-r--r-- | activestorage/lib/active_storage/engine.rb | 2 | ||||
| -rw-r--r-- | activestorage/lib/active_storage/service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activestorage/lib/active_storage/engine.rb b/activestorage/lib/active_storage/engine.rb index 71861b84ae..d1f05986ba 100644 --- a/activestorage/lib/active_storage/engine.rb +++ b/activestorage/lib/active_storage/engine.rb @@ -31,7 +31,7 @@ module ActiveStorage initializer "active_storage.services" do config.after_initialize do |app| if config_choice = app.config.active_storage.service - config_file = Pathname.new(Rails.root.join("config/storage_services.yml")) + config_file = Pathname.new(Rails.root.join("config/storage.yml")) raise("Couldn't find Active Storage configuration in #{config_file}") unless config_file.exist? require "yaml" diff --git a/activestorage/lib/active_storage/service.rb b/activestorage/lib/active_storage/service.rb index b648c51823..7559fd0e2b 100644 --- a/activestorage/lib/active_storage/service.rb +++ b/activestorage/lib/active_storage/service.rb @@ -10,7 +10,7 @@ require "active_storage/log_subscriber" # * +Mirror+, to be able to use several services to manage attachments. # # Inside a Rails application, you can set-up your services through the -# generated <tt>config/storage_services.yml</tt> file and reference one +# generated <tt>config/storage.yml</tt> file and reference one # of the aforementioned constant under the +service+ key. For example: # # local: |