diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2016-03-06 06:58:36 +0000 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2016-03-06 06:58:36 +0000 |
commit | 598816f630aadc5f63c8e36bc16accd6e15d4fb0 (patch) | |
tree | f5aaa698e7663896a339a86f9802a403d905d059 /guides/source/getting_started.md | |
parent | a2eb7962d3986c787d8ca66faca57c26617be499 (diff) | |
parent | b5bdcaa838bb85cf0fdfdaef036409ab3a8d4a91 (diff) | |
download | rails-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/getting_started.md')
-rw-r--r-- | guides/source/getting_started.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/getting_started.md b/guides/source/getting_started.md index 4431512eda..a615751eb5 100644 --- a/guides/source/getting_started.md +++ b/guides/source/getting_started.md @@ -690,7 +690,7 @@ class CreateArticles < ActiveRecord::Migration[5.0] t.string :title t.text :text - t.timestamps null: false + t.timestamps end end end @@ -1558,9 +1558,9 @@ class CreateComments < ActiveRecord::Migration[5.0] create_table :comments do |t| t.string :commenter t.text :body - t.references :article, index: true, foreign_key: true + t.references :article, foreign_key: true - t.timestamps null: false + t.timestamps end end end |