aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/migration.rb12
1 files changed, 2 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 4bd3962d3a..10073e2b37 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -610,18 +610,10 @@ module ActiveRecord
migrations_paths.first
end
- def migrations(paths, *args)
- if args.empty?
- subdirectories = true
- else
- subdirectories = args.first
- ActiveSupport::Deprecation.warn "The `subdirectories` argument to `migrations` is deprecated"
- end
-
+ def migrations(paths)
paths = Array(paths)
- glob = subdirectories ? "**/" : ""
- files = Dir[*paths.map { |p| "#{p}/#{glob}[0-9]*_*.rb" }]
+ files = Dir[*paths.map { |p| "#{p}/**/[0-9]*_*.rb" }]
seen = Hash.new false