aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13612 from eval/issue-13588Rafael Mendonça França2014-01-304-16/+230
|\
| * Add CreateMigration actionGert Goet2014-01-284-16/+230
* | fix typo and indent. [ci skip]Yves Senn2014-01-302-2/+2
* | Merge pull request #13774 from prathamesh-sonpatki/post-to-articleYves Senn2014-01-3020-407/+429
|\ \
| * | Replace Post with Article in getting started guide [ci skip]Prathamesh Sonpatki2014-01-2520-407/+429
* | | Merge pull request #13884 from rafaelfranca/rm-travel-backRafael Mendonça França2014-01-306-14/+58
|\ \ \
| * | | Improve documentation [ci skip]Rafael Mendonça França2014-01-302-5/+7
| * | | Remove automatic removal of Date/Time stubs after each test caseRafael Mendonça França2014-01-305-10/+22
| * | | Add `travel_back` to remove stubs from `travel` and `travel_to`Rafael Mendonça França2014-01-304-3/+33
|/ / /
* | | Merge pull request #13878 from marcandre/leave_my_options_aloneRafael Mendonça França2014-01-302-2/+8
|\ \ \
| * | | find_in_batches should not mutate its argumentMarc-Andre Lafortune2014-01-292-2/+8
* | | | tidy CHANGELOGs [ci skip]Yves Senn2014-01-305-18/+25
* | | | docs, `references` is only used with `includes`. Closes #13727.Yves Senn2014-01-301-9/+14
* | | | Merge pull request #13888 from rails/session-serializerGodfrey Chan2014-01-306-32/+23
|\ \ \ \
| * | | | Modify the session serializer implementationGuillermo Iguaran2014-01-306-32/+23
|/ / / /
* | | | Merge pull request #13883 from rafaelfranca/rm-time-travelRafael Mendonça França2014-01-291-4/+53
|\ \ \ \
| * | | | Use each_valueRafael Mendonça França2014-01-291-1/+1
| * | | | Store the singleton_class in a local variableRafael Mendonça França2014-01-291-3/+4
| * | | | Change the class and method visibilityRafael Mendonça França2014-01-291-9/+13
| * | | | Use instance method instead of before hookRafael Mendonça França2014-01-291-9/+8
| * | | | Alias the original method first to avoid warningsRafael Mendonça França2014-01-291-2/+7
| * | | | Implement a simple stub feature to use in the Time travel helpersRafael Mendonça França2014-01-291-4/+44
|/ / / /
* | | | Merge pull request #13879 from schneems/schneems/more-explicit-database-confi...Rafael Mendonça França2014-01-291-0/+2
|\ \ \ \
| * | | | Enhance errors while retrieving database configschneems2014-01-291-0/+2
* | | | | AestheticRafael Mendonça França2014-01-293-13/+13
* | | | | Merge pull request #13867 from mauricio/bug-13861Rafael Mendonça França2014-01-295-1/+52
|\ \ \ \ \
| * | | | | Fixing issue with activerecord serialization not being able to dump a record ...Mauricio Linhares2014-01-295-1/+52
* | | | | | Merge pull request #13876 from sowjumn/masterRafael Mendonça França2014-01-291-10/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Added some style changes in asset pipeline documentationsowjanya2014-01-291-10/+5
* | | | | | Merge pull request #13871 from kassio/fix-filters-with-classes-documentationRobin Dupret2014-01-293-2/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix documentation of new controller filters api [ci skip]Kassio Borges2014-01-293-2/+12
|/ / / / /
* | | | | Merge pull request #13201 from marcandre/find_in_batch_enumeratorRafael Mendonça França2014-01-293-0/+27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | `find_in_batches` now returns an `Enumerator` when called without a block, so...Marc-Andre Lafortune2013-12-063-0/+27
* | | | | Merge pull request #13877 from marcandre/find_in_batchesRafael Mendonça França2014-01-291-0/+2
|\ \ \ \ \
| * | | | | Mention find_each in find_in_batches doc [ci skip]Marc-Andre Lafortune2014-01-291-0/+2
|/ / / / /
* | | | | Merge pull request #13450 from chancancode/ar_raise_on_conflictGodfrey Chan2014-01-298-9/+219
|\ \ \ \ \
| * | | | | `enum` now raises on "dangerous" name conflictsGodfrey Chan2014-01-293-3/+113
| * | | | | `scope` now raises on "dangerous" name conflictsGodfrey Chan2014-01-294-4/+95
| * | | | | Fixed a bug in AR::Base#respond_to?Godfrey Chan2014-01-292-2/+11
|/ / / / /
* | | | | Update CHANGELOG properly with GH #13692 [ci-skip]Guillermo Iguaran2014-01-291-14/+14
* | | | | Merge pull request #13692 from lukesarnacki/change-default-session-serializerGuillermo Iguaran2014-01-2911-10/+121
|\ \ \ \ \
| * | | | | Allow session serializer key in config.session_storeLukasz Sarnacki2014-01-2911-10/+121
* | | | | | Merge pull request #13868 from mauricio/bug-13788Yves Senn2014-01-293-1/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Correctly send the string given to lock! and reload(:lock) to the lock scope ...Mauricio Linhares2014-01-293-1/+22
|/ / / / /
* | | | | always use a block for cleanup / prepare callbacks so we can clean the method...Aaron Patterson2014-01-281-0/+9
* | | | | scope is not necessaryAaron Patterson2014-01-281-2/+2
* | | | | Merge pull request #13864 from sowjumn/masterRafael Mendonça França2014-01-281-1/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Added documentation for css_compressorsowjanya2014-01-281-1/+6
* | | | | Merge pull request #13813 from lukesarnacki/log-deep-mungeRafael Mendonça França2014-01-286-4/+77
|\ \ \ \ \
| * | | | | Log which keys were set to nil in deep_mungeLukasz Sarnacki2014-01-286-4/+77
| |/ / / /