aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-15 15:22:33 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-15 15:22:33 -0200
commitca8e14862a9f6f3ec37fb2842d76ecefd4eb2b4e (patch)
treeda4ac7e4f893b294d02f8564dfd675c0bc0046d6 /railties/lib/rails
parentff370ee61754b00f864f3ddd0af62be4dfa0de67 (diff)
parente73fe1dd8c2740ae29e7a7f48d71a62b46e6b49d (diff)
downloadrails-ca8e14862a9f6f3ec37fb2842d76ecefd4eb2b4e.tar.gz
rails-ca8e14862a9f6f3ec37fb2842d76ecefd4eb2b4e.tar.bz2
rails-ca8e14862a9f6f3ec37fb2842d76ecefd4eb2b4e.zip
Merge remote-tracking branch 'origin/master' into merge-action-cable
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/db/seeds.rb.tt4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/db/seeds.rb.tt b/railties/lib/rails/generators/rails/app/templates/db/seeds.rb.tt
index 4edb1e857e..1a289be5e8 100644
--- a/railties/lib/rails/generators/rails/app/templates/db/seeds.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/db/seeds.rb.tt
@@ -3,5 +3,5 @@
#
# Examples:
#
-# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
-# Mayor.create(name: 'Emanuel', city: cities.first)
+# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
+# Character.create(name: 'Luke', movie: movies.first)