diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-16 11:43:13 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-16 11:43:13 -0700 |
| commit | 2549f6d8ee104d1f83f573f5057c5f5e7c699608 (patch) | |
| tree | fe7955cb4cf106458e6ce45c15b18c65bf4246bb /activerecord/lib/rails/generators | |
| parent | 23f35b2fd87b586278b167bb3f614df00811b104 (diff) | |
| parent | f2ca5aa5c2e9fed43ab11937906d98bd436ab820 (diff) | |
| download | rails-2549f6d8ee104d1f83f573f5057c5f5e7c699608.tar.gz rails-2549f6d8ee104d1f83f573f5057c5f5e7c699608.tar.bz2 rails-2549f6d8ee104d1f83f573f5057c5f5e7c699608.zip | |
Merge branch 'master' into joindep
* master:
Rephrase ActiveRecord transaction rollback warning
Fix code blocks identation on AR and AS CHANGELOGs
Removing unused fake models from actionpack tests
Diffstat (limited to 'activerecord/lib/rails/generators')
0 files changed, 0 insertions, 0 deletions