aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ /
* | | Merge pull request #11821 from kuroda/select-and-order-by-aliased-attributesGodfrey Chan2014-01-284-1/+44
|\ \ \ | |/ / |/| |
| * | Handle aliased attributes in AR::Relation#select, #order, etc.Tsutomu Kuroda2014-01-294-1/+44
|/ /
* | Fix indent on test case [ci skip]Carlos Antonio da Silva2014-01-281-2/+2
* | Merge pull request #13838 from vipulnsward/13197-fix-has-one-documentationDamien Mathieu2014-01-281-1/+2
|\ \
| * | Add docs about behaviour of replacing a has_one associate object, that the pr...Vipul A M2014-01-281-1/+2
* | | Merge pull request #13857 from teoljungberg/replace-file-exists-ehCarlos Antonio da Silva2014-01-271-1/+1
|\ \ \
| * | | Replace File.exists? with File.exist?Teo Ljungberg2014-01-271-1/+1
* | | | Merge pull request #13855 from kuldeepaggarwal/reset_validatorsCarlos Antonio da Silva2014-01-273-4/+4
|\ \ \ \
| * | | | use the new clear_validators! api everywhere to reset validators in testsKuldeep Aggarwal2014-01-283-4/+4
|/ / / /
* | | | Merge pull request #13832 from kassio/setup-for-raise-missing-translationsRafael Mendonça França2014-01-277-4/+33
|\ \ \ \
| * | | | Rails config for raise on missing translationsKassio Borges2014-01-277-4/+33