diff options
| author | claudiob <claudiob@users.noreply.github.com> | 2017-12-08 07:15:08 -0800 |
|---|---|---|
| committer | claudiob <claudiob@users.noreply.github.com> | 2017-12-14 22:50:30 -0800 |
| commit | 74996cec93adf10e4e12e3f53479c4b3364dbb14 (patch) | |
| tree | 01e9bd77f49b98a2ee53045184d61c28c1be8ee5 | |
| parent | 597b941930af87a4bfe9d1cdb05578091eb83735 (diff) | |
| download | rails-74996cec93adf10e4e12e3f53479c4b3364dbb14.tar.gz rails-74996cec93adf10e4e12e3f53479c4b3364dbb14.tar.bz2 rails-74996cec93adf10e4e12e3f53479c4b3364dbb14.zip | |
Don't run rails active_storage:install in new apps
See #31315 for full discussion
| -rw-r--r-- | guides/source/active_storage_overview.md | 3 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 10 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 4 |
4 files changed, 2 insertions, 16 deletions
diff --git a/guides/source/active_storage_overview.md b/guides/source/active_storage_overview.md index 2ab14ad3de..dc94046084 100644 --- a/guides/source/active_storage_overview.md +++ b/guides/source/active_storage_overview.md @@ -41,9 +41,6 @@ application to Rails 5.2, run `rails active_storage:install` to generate a migration that creates these tables. Use `rails db:migrate` to run the migration. -You need not run `rails active_storage:install` in a new Rails 5.2 application: -the migration is generated automatically. - Declare Active Storage services in `config/storage.yml`. For each service your application uses, provide a name and the requisite configuration. The example below declares three services named `local`, `test`, and `s3`: diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index b9ae24de59..59184020ae 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -456,16 +456,6 @@ module Rails end end - def run_active_storage - unless skip_active_storage? - if bundle_install? - rails_command "active_storage:install", capture: options[:quiet] - else - log("Active Storage installation was skipped. Please run `bin/rails active_storage:install` to install Active Storage files.") - end - end - end - def empty_directory_with_keep_file(destination, config = {}) empty_directory(destination, config) keep_file(destination) diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index bf4570db90..fd9da7803f 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -463,7 +463,6 @@ module Rails public_task :apply_rails_template, :run_bundle public_task :run_webpack, :generate_spring_binstubs - public_task :run_active_storage def run_after_bundle_callbacks @after_bundle_callbacks.each(&:call) diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 96803db838..f953f319af 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -854,7 +854,7 @@ class AppGeneratorTest < Rails::Generators::TestCase template end - sequence = ["git init", "install", "exec spring binstub --all", "active_storage:install", "echo ran after_bundle"] + sequence = ["git init", "install", "exec spring binstub --all", "echo ran after_bundle"] @sequence_step ||= 0 ensure_bundler_first = -> command, options = nil do assert_equal sequence[@sequence_step], command, "commands should be called in sequence #{sequence}" @@ -871,7 +871,7 @@ class AppGeneratorTest < Rails::Generators::TestCase end end - assert_equal 5, @sequence_step + assert_equal 4, @sequence_step end def test_gitignore |