aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* bumping to rc3Aaron Patterson2013-10-111-1/+1
* Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"Rafael Mendonça França2013-10-102-1/+1
* Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"Rafael Mendonça França2013-10-101-1/+0
* bumping to rc2Aaron Patterson2013-10-041-1/+1
* Merge pull request #12443 from arthurnn/add_inverse_of_add_targetRafael Mendonça França2013-10-041-0/+1
* bumping version to 3.2.15.rc1Aaron Patterson2013-10-031-2/+2
* Merge pull request #12084 from Ben-M/3-2-stableAaron Patterson2013-10-031-1/+1
|\
| * Fix STI scopes using benolee's suggestion. Fixes #11939Ben Maraney2013-08-301-1/+1
* | Move set_inverse_instance to association.build_recordArthur Neves2013-09-302-1/+1
* | fix inverse_of when find_or_initialize_by_*Arthur Neves2013-09-261-4/+6
* | Merge pull request #12359 from arthurnn/inverse_on_callbacksRafael Mendonça França2013-09-251-0/+1
* | Fix FinderMethods#last unscoped primary keyEugene Kalenkovich2013-09-121-2/+2
* | on SchemaCache use the connection getter instead of the obj givenArthur Neves2013-09-091-2/+2
|/
* Load fixtures from linked foldersKassio Borges2013-08-051-2/+2
* Specified column type for quote_valueAlfred Wong2013-07-241-1/+1
* Fix merge error when Equality LHS is non-attribute.90yukke2013-07-231-2/+3
* Preparing for 3.2.14 releaseRafael Mendonça França2013-07-221-1/+1
* Preparing for 3.2.14.rc2 releaseRafael Mendonça França2013-07-161-1/+1
* Merge pull request #11451 from jetthoughts/11450_do_not_resave_destroyed_asso...Yves Senn2013-07-151-0/+2
* Preparing for 3.2.14.rc1 releaseRafael Mendonça França2013-07-121-2/+2
* Do not shallow the original exception in exec_cacheRafael Mendonça França2013-07-091-1/+5
* Allow global override of default STI inheritance columnchapmajs2013-06-261-1/+1
* Merge pull request #10373 from janko-m/fix-store-accessorCarlos Antonio da Silva2013-06-251-1/+1
|\
| * Fix ActiveRecord::Store not tracking changesJanko Marohnić2013-04-291-1/+1
* | Revert "Revert "Merge pull request #10901 from armstrjare/fix_query_null_fore...Yves Senn2013-06-251-1/+1
* | Revert "Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_...Yves Senn2013-06-221-1/+1
* | Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_on_new_r...Yves Senn2013-06-221-1/+1
|\ \
| * | Fixes CollectionAssociation#ids_reader returning incorrect ids for new recordsJared Armstrong2013-06-211-1/+1
* | | Merge pull request #10925 from senny/10917_test_to_prevent_regressionYves Senn2013-06-151-3/+5
|/ /
* | Restore rescue block for when IM is enabledAndrew White2013-05-241-19/+22
* | It's scoped in 3-2-stable!Arun Agrawal2013-05-241-1/+1
* | Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_manyRafael Mendonça França2013-05-231-2/+1
* | destroys association records before saving/inserting new association recordsJohnny Holton2013-05-181-28/+20
* | Backport a super-simplified version of #6792, fixingBen Woosley2013-05-141-0/+1
* | Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0Rafael Mendonça França2013-05-121-0/+6
|\ \
| * | backport runner fixes to 3-2-stablekennyj2012-12-161-0/+6
* | | Preserve context for joins while merging relationsAndrew Horner2013-05-113-3/+34
* | | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-121-1/+1
* | | Revert "Don't try to EXPLAIN select_db calls"Xavier Noria2013-05-111-1/+1
* | | Using map. No need to run query againArun Agrawal2013-05-101-1/+1
* | | Merge pull request #10555 from dasch/dasch/3-2-stableXavier Noria2013-05-101-1/+1
|\ \ \
| * | | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-101-1/+1
| | |/ | |/|
* | | Fixed pluck to be working with selects.Arun Agrawal2013-05-101-1/+4
* | | Remove useless elseArun Agrawal2013-05-101-3/+0
* | | Revert "Merge pull request #8209 from senny/backport_8176"Rafael Mendonça França2013-05-081-3/+2
* | | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroyRafael Mendonça França2013-05-061-1/+4
|/ /
* | Document nested attributes as hash of hashesAlexey Muranov2013-04-131-17/+41
* | Correctly parse bigint defaults in PostgreSQL, Backpost #10098.Erik Peterson2013-04-111-1/+1
* | Merge pull request #7792 from seejee/chained_scopes_preload_properlyCarlos Antonio da Silva2013-04-031-2/+7
|\ \
| * | Chained scopes will be preloaded properly. Fixes #7490Chris Geihsler2013-04-031-2/+7