aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/active_record_migrations.md
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2016-03-06 06:58:36 +0000
committerVijay Dev <vijaydev.cse@gmail.com>2016-03-06 06:58:36 +0000
commit598816f630aadc5f63c8e36bc16accd6e15d4fb0 (patch)
treef5aaa698e7663896a339a86f9802a403d905d059 /guides/source/active_record_migrations.md
parenta2eb7962d3986c787d8ca66faca57c26617be499 (diff)
parentb5bdcaa838bb85cf0fdfdaef036409ab3a8d4a91 (diff)
downloadrails-598816f630aadc5f63c8e36bc16accd6e15d4fb0.tar.gz
rails-598816f630aadc5f63c8e36bc16accd6e15d4fb0.tar.bz2
rails-598816f630aadc5f63c8e36bc16accd6e15d4fb0.zip
Merge branch 'master' of github.com:rails/docrails
Conflicts: guides/source/association_basics.md
Diffstat (limited to 'guides/source/active_record_migrations.md')
-rw-r--r--guides/source/active_record_migrations.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/active_record_migrations.md b/guides/source/active_record_migrations.md
index feb0de8eea..cd6b7fdd67 100644
--- a/guides/source/active_record_migrations.md
+++ b/guides/source/active_record_migrations.md
@@ -41,7 +41,7 @@ class CreateProducts < ActiveRecord::Migration[5.0]
t.string :name
t.text :description
- t.timestamps null: false
+ t.timestamps
end
end
end
@@ -847,7 +847,7 @@ class CreateProducts < ActiveRecord::Migration[5.0]
create_table :products do |t|
t.string :name
t.text :description
- t.timestamps null: false
+ t.timestamps
end
end