aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* set default_headers to nil after use it to avoid order dependent testsFrancesco Rodriguez2012-09-081-25/+32
* Tidy up excerpt separator logic a bitCarlos Antonio da Silva2012-09-081-17/+11
* Improve latest AR and AP changelog entriesCarlos Antonio da Silva2012-09-082-2/+10
* Refactor some date helpers to use merge!Carlos Antonio da Silva2012-09-081-5/+9
* Refactor nested attributes limit logic to lookup :limit option only onceCarlos Antonio da Silva2012-09-081-11/+12
* Merge pull request #7189 from GCorbel/excerpt_with_separationCarlos Antonio da Silva2012-09-083-11/+64
|\
| * Add a separation option for the excerpt functionGuirec Corbel2012-09-083-11/+64
* | Merge pull request #7566 from etehtsea/schema-new-hashCarlos Antonio da Silva2012-09-085-61/+63
|\ \
| * | Dump schema using new style hashKonstantin Shabanov2012-09-085-61/+63
| |/
* | Merge pull request #7568 from alup/masterCarlos Antonio da Silva2012-09-082-0/+29
|\ \ | |/ |/|
| * Add integration tests for reset_session in cookie storeAndreas Loupasakis2012-09-081-0/+20
| * Add test for clear in ActionDispatch::Request::SessionAndreas Loupasakis2012-09-081-0/+9
|/
* Add changelog entry for #7545: map interval with precision to stringCarlos Antonio da Silva2012-09-071-0/+2
* Merge pull request #7545 from senny/7518_postgres_type_detectionAaron Patterson2012-09-073-3/+6
|\
| * postgres, map scaled intervals to string datatype (#7518)Yves Senn2012-09-063-3/+6
* | Minor refactor in ActiveRecord#initialize_dupCarlos Antonio da Silva2012-09-073-12/+4
* | Merge pull request #7565 from guilleiguaran/dalli-session-storeCarlos Antonio da Silva2012-09-071-2/+6
|\ \
| * | Improve error message for memcache session store when dalli isn't loaded in appGuillermo Iguaran2012-09-071-2/+6
* | | create a transaction object and point AR objects at that object during aAaron Patterson2012-09-074-12/+55
* | | Fix AS tests due to builder change with nil values / empty stringsCarlos Antonio da Silva2012-09-071-2/+2
* | | Fix AR tests due to builder change with nil values / empty stringsCarlos Antonio da Silva2012-09-071-6/+6
* | | Bump builder dependencies in Active Model and Action PackCarlos Antonio da Silva2012-09-072-2/+2
* | | Update Active Model xml serialization test to reflect a change in builderCarlos Antonio da Silva2012-09-072-1/+12
* | | Use merge! to merge additional options onto default optionsCarlos Antonio da Silva2012-09-071-4/+3
* | | Fix Active Support changelog formatting [ci skip]Carlos Antonio da Silva2012-09-071-2/+2
* | | Remove 3.2.x entries from Active Record changelog [ci skip]Carlos Antonio da Silva2012-09-071-100/+0
* | | Add Changelog entry for #4976: fix eager load associations without pks [ci skip]Carlos Antonio da Silva2012-09-071-0/+2
* | | Add Changelog entry for #7560: deprecate #filter in AS::Callbacks [ci skip]Carlos Antonio da Silva2012-09-071-0/+22
* | | Merge pull request #7552 from guilleiguaran/dalli-session-storeSantiago Pastorino2012-09-073-13/+8
|\| |
| * | Dalli doesn't support autoloading of unloaded classesGuillermo Iguaran2012-09-061-5/+0
| * | Use dalli 2.2.1 or prior to fix failing tests in memcache session storeGuillermo Iguaran2012-09-061-1/+1
| * | More fixes for action pack tests with Dalli.Arun Agrawal2012-09-061-3/+3
| * | Let's run action pack tests with DalliArun Agrawal2012-09-061-4/+4
* | | Merge pull request #7560 from bogdan/deprecate_callbacks_monkeypatchJosé Valim2012-09-073-8/+9
|\ \ \
| * | | AS::Callbacks: deprecate monkey patch of object callbacksBogdan Gusiev2012-09-073-8/+9
|/ / /
* | | Merge pull request #4976 from kreynolds/fix_eager_without_pkeyJon Leighton2012-09-072-1/+9
|\ \ \
| * | | Change JoinPart test from an integration to a unit testKelley Reynolds2012-07-052-13/+8
| * | | Fix eagerly loading associations without primary keysKelley Reynolds2012-02-092-1/+14
* | | | fix tests on Ruby 2.0.0Aaron Patterson2012-09-061-1/+1
| |/ / |/| |
* | | Merge pull request #7549 from asanghi/masterCarlos Antonio da Silva2012-09-061-1/+1
|\ \ \
| * | | fix bad changelog exampleAditya Sanghi2012-09-071-1/+1
* | | | Merge pull request #7550 from sikachu/master-changelogCarlos Antonio da Silva2012-09-061-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Update Active Record CHANGELOG for #7419Prem Sichanugrist2012-09-061-0/+6
|/ / /
* | | Merge pull request #7419 from releu/fix-invalid-filename-migration-generatorJosé Valim2012-09-062-0/+16
|\ \ \ | |_|/ |/| |
| * | add mini-validator on creating migrationJan Bernacki2012-09-062-0/+16
|/ /
* | Merge pull request #7542 from aaronrenner/patch-2José Valim2012-09-061-1/+1
|\ \
| * | Fixed around callback with lambda exampleAaron Renner2012-09-061-1/+1
|/ /
* | we already have the module objects, do not constantizeXavier Noria2012-09-061-2/+6
* | restores awesome commentXavier Noria2012-09-061-0/+19
* | no more const_missing combinatoricsXavier Noria2012-09-061-41/+2