diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-17 13:42:42 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-17 13:42:42 -0800 |
| commit | 23ce2f61b5a7699af8213bf1b5d581da194ab8f4 (patch) | |
| tree | b2adcb398f6b5171e15fd681fd23d5c94ca1cdcf /activerecord/lib/active_record/core.rb | |
| parent | fe42effb11a97cf19777d7b0dba7e1e2dfd3316c (diff) | |
| parent | c18e7ab44706735d9b1274760bdc62ad5bef7757 (diff) | |
| download | rails-23ce2f61b5a7699af8213bf1b5d581da194ab8f4.tar.gz rails-23ce2f61b5a7699af8213bf1b5d581da194ab8f4.tar.bz2 rails-23ce2f61b5a7699af8213bf1b5d581da194ab8f4.zip | |
Merge branch 'master' into adequaterecord
* master:
Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"
No need to use symbols
Don't skip tests if they are not broken. Just don't define they
Fix typo [ci skip]
Resolve encoding issues with arrays of hstore (bug 11135).
Fix coffeescript sample [ci skip]
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
0 files changed, 0 insertions, 0 deletions