aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Adds the Rails maintenance policy to the GuidesMatias Korhonen2013-10-033-0/+70
| * | | Merge pull request #12428 from arunagw/running_isolated_test_avRafael Mendonça França2013-10-021-1/+1
| |\ \ \
| | * | | Running all isolated test for actionviewArun Agrawal2013-10-031-1/+1
| |/ / /
| * | | association builder is no longer needed for counter cache, so remove itAaron Patterson2013-10-021-7/+6
| * | | push constructable? on to the reflectionAaron Patterson2013-10-025-18/+22
| * | | name is on the reflection, so just use the reflectionAaron Patterson2013-10-021-2/+2
| * | | decouple define_callback from the instanceAaron Patterson2013-10-021-2/+4
| |/ /
| * | Merge pull request #12426 from arunagw/added_activemodel_in_railsgemspecGuillermo Iguaran2013-10-021-0/+1
| |\ \
| | * | Added activemodel as a explicit dependencyArun Agrawal2013-10-021-0/+1
| |/ /
| * | unify `Fixes` notes in AR changelog. [ci skip].Yves Senn2013-10-021-7/+7
| * | improving `reload` doc wording. #12418 [ci skip]Yves Senn2013-10-021-1/+2
| * | Merge pull request #12418 from makaroni4/fix/ar_reload_doc_12101Yves Senn2013-10-011-2/+11
| |\ \
| | * | Update AR reload doc for the case of manually set primary key attribute [ci s...Anatoli Makarevich2013-10-021-2/+11
* | | | move habtm translation to a builder classAaron Patterson2013-10-022-89/+116
* | | | get the left and right association names from the join modelAaron Patterson2013-10-021-8/+17
* | | | define the join model without using closures on the methodsAaron Patterson2013-10-021-18/+31
* | | | decouple the HABTM builderAaron Patterson2013-10-011-2/+31
* | | | only pass options to the habtm builderAaron Patterson2013-10-011-1/+1
* | | | Squashed commit of the following:Aaron Patterson2013-10-017-19/+109
|/ / /
* | | Merge pull request #12416 from sepastian/guides_configuring_initialization_hooksYves Senn2013-10-011-1/+1
|\ \ \ | |/ / |/| |
| * | guides: configuring: fixing explanation of :after_initialize hookSebastian Gassner2013-10-011-1/+1
|/ /
* | revises the docs of require_dependency [ci skip]Xavier Noria2013-10-011-1/+9
* | registers 0b0beb7 in the CHANGELOG [ci skip]Xavier Noria2013-10-011-0/+5
* | Merge pull request #12412 from bf4/allow_pathname_for_require_dependencyXavier Noria2013-09-302-1/+14
|\ \
| * | require_dependency should allow Pathname-like objects, not just StringBenjamin Fleischer2013-09-302-1/+14
* | | extract adapter savepoint implementations into `abstract/savepoints.rb`.Yves Senn2013-09-306-46/+27
* | | change the savepoint interface to allow passing the name.Yves Senn2013-09-306-21/+56
* | | Merge pull request #12407 from senny/extract_next_migration_number_into_moduleYves Senn2013-09-303-8/+24
|\ \ \
| * | | Make `.next_migration_number` reusable for third party AR generators.Yves Senn2013-09-303-8/+24
|/ / /
* | | Add changlog entry for #10844Andrew White2013-09-301-0/+7
* | | Merge branch 'fix-ip-spoof-errors' of https://github.com/tamird/rails into ta...Andrew White2013-09-302-1/+11
|\ \ \
| * | | make sure both headers are set before checking for ip spoofingTamir Duberstein2013-06-042-1/+11
* | | | fix `test_sqlite3_mem` test run.Yves Senn2013-09-301-0/+1
* | | | Merge pull request #12383 from marclennox/masterRafael Mendonça França2013-09-292-2/+11
|\ \ \ \
| * | | | Fixed issue #12327Marc Lennox2013-09-272-2/+11
* | | | | Merge pull request #12400 from jaredbeck/fixes_guide_re_action_on_unpermitted...Rafael Mendonça França2013-09-281-1/+1
|\ \ \ \ \
| * | | | | fixes incorrect spelling of `action_on_unpermitted_parameters`Jared Beck2013-09-281-1/+1
|/ / / / /
* | | | | Merge pull request #12354 from kennyj/fix_12293Rafael Mendonça França2013-09-283-1/+26
|\ \ \ \ \
| * | | | | Strong parameters should permit nested number as key. Closes #12293kennyj2013-09-273-1/+26
* | | | | | Merge pull request #12387 from francisgo/patch-9Rafael Mendonça França2013-09-281-14/+14
|\ \ \ \ \ \
| * | | | | | Migrations Guide: Add semicolon to sentences before code block [ci skip]Francis Go2013-09-281-14/+14
* | | | | | | Merge pull request #12398 from thedarkone/thread-safety-stuffRafael Mendonça França2013-09-283-25/+35
|\ \ \ \ \ \ \
| * | | | | | | Make GTG::TransTable thread safe.thedarkone2013-09-281-12/+23
| * | | | | | | Use TS::Cache instead of Mutex + Hash.thedarkone2013-09-281-12/+8
| * | | | | | | Replace global Hash with TS::Cache.thedarkone2013-09-281-1/+4
* | | | | | | | Merge pull request #11496 from jetthoughts/11376_has_many_assoc_respect_scope...Rafael Mendonça França2013-09-284-4/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed where_values_hash from AR::NullRelationPaul Nikitochkin2013-09-284-4/+34
* | | | | | | | | Merge pull request #12396 from arthurnn/cleanup_logsubsRafael Mendonça França2013-09-281-11/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cleanup identitymap logger from LogSubscriberArthur Neves2013-09-281-11/+2
* | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-2810-60/+27
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |