aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/rails
diff options
context:
space:
mode:
authorGannon McGibbon <gannon.mcgibbon@gmail.com>2019-05-10 16:45:46 -0400
committerGannon McGibbon <gannon.mcgibbon@gmail.com>2019-05-10 16:45:46 -0400
commite84ee74854876be00c3d072182af4c936c7d303c (patch)
tree8f2f28cf1d3084d63de98fa6bac897294638a1a3 /activerecord/lib/rails
parent36d145ca457d7f663517ac4096d8fae3da2491a9 (diff)
parent93d2090011b5ccab504b8aeabf6a95b23193a689 (diff)
downloadrails-e84ee74854876be00c3d072182af4c936c7d303c.tar.gz
rails-e84ee74854876be00c3d072182af4c936c7d303c.tar.bz2
rails-e84ee74854876be00c3d072182af4c936c7d303c.zip
Merge branch 'migration-timestamp-fix'
Closes #28707.
Diffstat (limited to 'activerecord/lib/rails')
-rw-r--r--activerecord/lib/rails/generators/active_record/migration/migration_generator.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
index cb2c74f1ca..0620a515bd 100644
--- a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
@@ -7,6 +7,7 @@ module ActiveRecord
class MigrationGenerator < Base # :nodoc:
argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
+ class_option :timestamps, type: :boolean
class_option :primary_key_type, type: :string, desc: "The type for primary key"
class_option :database, type: :string, aliases: %i(--db), desc: "The database for your migration. By default, the current environment's primary database is used."