diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-11-17 01:50:49 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-11-17 01:50:49 +0530 |
| commit | 7b70eeed43045dc29e73e23fbfdc323e9d397026 (patch) | |
| tree | 8c60cd5893f7e2d231130b7c0abdc0aee8e3bec7 /activerecord/lib/active_record/fixtures.rb | |
| parent | 8eefdb6d7056dc0d4d63a5c34a4b12701ba21c88 (diff) | |
| parent | 1fd008cd44cd2eea37db57ee6b3c17d3585d88c1 (diff) | |
| download | rails-7b70eeed43045dc29e73e23fbfdc323e9d397026.tar.gz rails-7b70eeed43045dc29e73e23fbfdc323e9d397026.tar.bz2 rails-7b70eeed43045dc29e73e23fbfdc323e9d397026.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_dispatch/routing/redirection.rb
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 79d37147d0..26ad2087c1 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -250,7 +250,7 @@ module ActiveRecord # # ### in fruit.rb # - # belongs_to :eater, :polymorphic => true + # belongs_to :eater, polymorphic: true # # ### in fruits.yml # @@ -730,7 +730,7 @@ module ActiveRecord # # Examples: # - # set_fixture_class :some_fixture => SomeModel, + # set_fixture_class some_fixture: SomeModel, # 'namespaced/fixture' => Another::Model # # The keys must be the fixture names, that coincide with the short paths to the fixture files. |