aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2018-10-01 17:47:07 -0700
committerDavid Heinemeier Hansson <david@loudthinking.com>2018-10-01 17:47:07 -0700
commit39d9b7ca50be0bb2f2326485299ec5fae1f0fda4 (patch)
treeae5ac93f6efb923d0b6ff1c579d38ff427d040ae /lib
parentdac1e1ca07aedcb0a04bbecb37abdf0b8931cf5e (diff)
downloadrails-39d9b7ca50be0bb2f2326485299ec5fae1f0fda4.tar.gz
rails-39d9b7ca50be0bb2f2326485299ec5fae1f0fda4.tar.bz2
rails-39d9b7ca50be0bb2f2326485299ec5fae1f0fda4.zip
Fix that both migrations wouldnt be copied over because railties:install:migrations could only be invoked once per run
Diffstat (limited to 'lib')
-rw-r--r--lib/tasks/actiontext.rake12
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/tasks/actiontext.rake b/lib/tasks/actiontext.rake
index 767fbf71b7..e73ed34691 100644
--- a/lib/tasks/actiontext.rake
+++ b/lib/tasks/actiontext.rake
@@ -5,14 +5,12 @@ namespace :action_text do
Rake::Task["install:migrations"].clear_comments
desc "Copy over the migration, stylesheet, and JavaScript files"
- task install: %w( environment copy_migration copy_stylesheet copy_fixtures active_storage:install )
+ task install: %w( environment copy_migrations copy_stylesheet copy_fixtures )
- task :copy_migration do
- if Rake::Task.task_defined?("action_text:install:migrations")
- Rake::Task["action_text:install:migrations"].invoke
- else
- Rake::Task["app:action_text:install:migrations"].invoke
- end
+ task :copy_migrations do
+ Rake::Task["active_storage:install:migrations"].invoke
+ Rake::Task["railties:install:migrations"].reenable # Otherwise you can't run 2 migration copy tasks in one invocation
+ Rake::Task["action_text:install:migrations"].invoke
end
STYLESHEET_TEMPLATE_PATH = File.expand_path("../templates/actiontext.css", __dir__)