diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-13 11:51:10 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-13 11:51:10 -0700 |
| commit | d53b5f073924e8b397ec86f7ad092aa0b5ed3fe4 (patch) | |
| tree | 78d2f76516e22944e2c41e318a0d54d5ad639289 /activerecord/test/fixtures/dogs.yml | |
| parent | b97ff316ec6d3fa962dc804d5aeb83aa81b2d847 (diff) | |
| parent | 37ca5b09662797928a4f74878595a4e577c5aedd (diff) | |
| download | rails-d53b5f073924e8b397ec86f7ad092aa0b5ed3fe4.tar.gz rails-d53b5f073924e8b397ec86f7ad092aa0b5ed3fe4.tar.bz2 rails-d53b5f073924e8b397ec86f7ad092aa0b5ed3fe4.zip | |
Merge branch 'master' into normalizecb
* master: (61 commits)
add tests for reset_calbacks
Fixing build broken by this change
Extract variable out of loop
Updated comment to Rails 4
Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext
better error message when app name is not passed in `rails new`
Code cleanup for ActionDispatch::Flash#call
Fix typo: require -> requires
Add CHANGELOG entry for #10576
Merge pull request #10556 from Empact/deprecate-schema-statements-distinct
Some editorial changes on the documentation.
respond_to -> respond to in a message from AM::Lint
specify that dom_(id|class) are deprecated in controllers, views are fine
copy edits [ci skip]
Fix class and method name typos
Replace multi_json with json
ruby -> Ruby
Adding documentation to the automatic inverse_of finder.
Improve CHANGELOG entry [ci kip]
Call assume_migrated_upto_version on connection
...
Conflicts:
activesupport/lib/active_support/callbacks.rb
Diffstat (limited to 'activerecord/test/fixtures/dogs.yml')
0 files changed, 0 insertions, 0 deletions