aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Clear filtered request attributes between requests in testsAndrew White2014-01-274-0/+29
* | | | docs, remove deprecation entry in favor of abe6484. [ci skip]Yves Senn2014-01-271-5/+0
* | | | Fix doc markup of clear_validators!Carlos Antonio da Silva2014-01-271-2/+2
* | | | Use the new clear_validators! api to reset validators in testsCarlos Antonio da Silva2014-01-2716-42/+33
* | | | Merge tests about multiple validation contextsCarlos Antonio da Silva2014-01-271-10/+6
* | | | mention #13314 in 4.1 release notes. refs #12140. [ci skip]Yves Senn2014-01-271-0/+3
* | | | Merge pull request #13754 from vpuzzella/masterCarlos Antonio da Silva2014-01-273-5/+45
|\ \ \ \ | |/ / / |/| | |
| * | | Ability to specify multiple contexts when defining a validation.Vince Puzzella2014-01-273-5/+45
* | | | Merge pull request #13848 from huoxito/tell-valueCarlos Antonio da Silva2014-01-271-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Display value when raising due to unscope() issuesWashington Luiz2014-01-271-1/+1
* | | | docs, clarify usage of `action_mailer.default_options`. [ci skip]. Closes #13...Yves Senn2014-01-271-4/+12
* | | | Merge pull request #13849 from fgo/patch-12Guillermo Iguaran2014-01-261-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Ruby on Rails 4.1 Release Notes: Fix spelling [ci skip]Francis Go2014-01-271-1/+1
|/ / /
* | | Make ActiveSupport::TimeWithZone#xmlschema consistentAndrew White2014-01-262-2/+6
* | | Add support for JSON time_precision to Time and DateTimeAndrew White2014-01-264-7/+25
* | | Add CHANGELOG entry for #11464Andrew White2014-01-261-0/+9
* | | Rename subsecond_fraction_digits option to time_precisionAndrew White2014-01-264-8/+10
* | | Consolidate JSON encoding tests in one fileAndrew White2014-01-262-46/+48
* | | Customize subsecond digits when encoding DateWithTimeParker Selbert2014-01-263-9/+30
* | | adds a section about booleans in the API guidelines [ci skip]Xavier Noria2014-01-261-0/+47
* | | API guidelines: revises warning about +...+ [ci skip]Xavier Noria2014-01-261-1/+4
* | | revises references to :allow_(nil|blank) in some docs [ci skip] [Steven Yang ...Xavier Noria2014-01-2610-26/+12
* | | Merge pull request #13846 from gsaks123/patch-1Robin Dupret2014-01-261-1/+1
|\ \ \ | |/ / |/| |