diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-05-24 05:40:05 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-05-24 05:40:05 -0700 |
| commit | dac68cb92265d2ff5d83560e8cd53ce17098aa30 (patch) | |
| tree | e35dae2a40c52d8cf03239185aa2f99a7ebaf3b5 | |
| parent | cedadad8911a0201891eeb9efc7682d2f2468c3b (diff) | |
| parent | 79dc275b8d1676976f8f633c9e678fa511ccaf52 (diff) | |
| download | rails-dac68cb92265d2ff5d83560e8cd53ce17098aa30.tar.gz rails-dac68cb92265d2ff5d83560e8cd53ce17098aa30.tar.bz2 rails-dac68cb92265d2ff5d83560e8cd53ce17098aa30.zip | |
Merge pull request #1257 from dmathieu/yml_alias
Properly reference yml alias nodes
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 2 | ||||
| -rw-r--r-- | activerecord/test/fixtures/parrots.yml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 49df63d585..1f31722a7c 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -385,11 +385,11 @@ class FixturesFileNotFound < StandardError; end # # first: # name: Smurf -# <<: *DEFAULTS +# *DEFAULTS # # second: # name: Fraggle -# <<: *DEFAULTS +# *DEFAULTS # # Any fixture labeled "DEFAULTS" is safely ignored. diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 089bbed08a..2c7298e220 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -27,7 +27,7 @@ db_namespace = namespace :db do # # development: # database: blog_development - # <<: *defaults + # *defaults next unless config['database'] # Only connect to local databases local_database?(config) { create_database(config) } diff --git a/activerecord/test/fixtures/parrots.yml b/activerecord/test/fixtures/parrots.yml index 8b73b8cdf6..8425ef98e0 100644 --- a/activerecord/test/fixtures/parrots.yml +++ b/activerecord/test/fixtures/parrots.yml @@ -24,4 +24,4 @@ DEFAULTS: &DEFAULTS parrot_sti_class: LiveParrot davey: - <<: *DEFAULTS + *DEFAULTS |