aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix textile markupRafael Mendonça França2013-06-241-1/+1
* Revert "Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_...Yves Senn2013-06-223-34/+1
* Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_on_new_r...Yves Senn2013-06-223-1/+34
|\
| * Fixes CollectionAssociation#ids_reader returning incorrect ids for new recordsJared Armstrong2013-06-213-1/+34
* | Merge pull request #11033 from robin850/patch-1Xavier Noria2013-06-201-5/+5
|\ \
| * | Update the feedback instructions [ci skip]Robin Dupret2013-06-201-5/+5
|/ /
* | Merge pull request #10883 from ifeelgoods/3-2-stableYves Senn2013-06-191-2/+2
|\ \
| * | indicate the default Rails cache storeMatthieu Paret2013-06-191-2/+2
* | | Compare host scheme using case-insensitive regexpRafael Mendonça França2013-06-163-11/+52
* | | nokogiri >= 1.6 doesn't work with ruby 1.8Rafael Mendonça França2013-06-151-1/+1
* | | Merge pull request #10925 from senny/10917_test_to_prevent_regressionYves Senn2013-06-153-3/+35
| |/ |/|
* | Override Time.at to work with Time-like valuesAndrew White2013-06-083-0/+38
|/
* adding a test for #10830Aaron Patterson2013-06-051-0/+46
* Restore rescue block for when IM is enabledAndrew White2013-05-241-19/+22
* Merge pull request #10745 from arunagw/build_fix_ruby187Andrew White2013-05-244-7/+7
|\
| * It's scoped in 3-2-stable!Arun Agrawal2013-05-241-1/+1
| * Using 1.8.7 syntax for 3-2-stableArun Agrawal2013-05-243-6/+6
|/
* Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_manyRafael Mendonça França2013-05-234-2/+15
* Merge pull request #10681 from jholton/3-2-stable-fix_association_auto_saveRafael Mendonça França2013-05-223-31/+48
|\
| * destroys association records before saving/inserting new association recordsJohnny Holton2013-05-183-31/+48
* | Merge pull request #10646 from kennyj/fix_am_20130517Rafael Mendonça França2013-05-201-1/+1
|/
* Merge pull request #10578 from dingle/lu/back_port_to_json_fixRafael Mendonça França2013-05-153-3/+19
|\
| * Support include_root_in_json for ActiveResource properly.Xinjiang Lu2013-05-153-3/+19
* | Merge pull request #10616 from Empact/backport-distinct-distinctRafael Mendonça França2013-05-143-0/+20
|\ \
| * | Backport a super-simplified version of #6792, fixingBen Woosley2013-05-143-0/+20
|/ /
* | Update mail to minimum version 2.5.4Mikel Lindsaar2013-05-141-1/+1
* | Improve CHANGELOG entriesRafael Mendonça França2013-05-122-3/+13
* | Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0Rafael Mendonça França2013-05-1210-1/+87
|\ \ | |/ |/|
| * backport runner fixes to 3-2-stablekennyj2012-12-1610-0/+88
* | Merge pull request #10303 from ahorner/3-2-stableRafael Mendonça França2013-05-115-4/+47
|\ \
| * | Preserve context for joins while merging relationsAndrew Horner2013-05-115-4/+47
|/ /
* | Merge pull request #10571 from dasch/dasch/restore-explain-fixRafael Mendonça França2013-05-113-1/+12
|\ \
| * | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-123-1/+12
* | | Add CHANGELOG entry removed by mistake [ci skip]Rafael Mendonça França2013-05-111-0/+7
|/ /
* | Revert "Don't try to EXPLAIN select_db calls"Xavier Noria2013-05-112-8/+1
* | So not make Fixnum#/ private on Ruby verions less than 1.9.3Rafael Mendonça França2013-05-101-4/+3
* | Fix test to ruby 2.0Rafael Mendonça França2013-05-101-2/+9
* | Merge pull request #10557 from arunagw/pluck-refactor-using-mapAndrew White2013-05-101-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-102-1/+8
|\ \
| * | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-102-1/+8
* | | Merge pull request #10552 from arunagw/pluck-fixed-3-2-stableRafael Mendonça França2013-05-102-6/+7
|\ \ \
| * | | Fixed pluck to be working with selects.Arun Agrawal2013-05-102-3/+7
| * | | Remove useless elseArun Agrawal2013-05-101-3/+0
|/ / /
* | | Revert "Merge pull request #8209 from senny/backport_8176"Rafael Mendonça França2013-05-083-6/+11
* | | Revert "Remove unicode character encoding from ActiveSupport::JSON.encode"Rafael Mendonça França2013-05-083-23/+23
* | | Merge pull request #10496 from arunagw/build-fix-scaffold-generatorCarlos Antonio da Silva2013-05-071-1/+1
|\ \ \
| * | | Build fix for scaffold generator Arun Agrawal2013-05-071-1/+1
|/ / /
* | | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroyRafael Mendonça França2013-05-063-1/+28
* | | Merge pull request #10478 from cainlevy/patch-1Rafael Mendonça França2013-05-061-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 05:00:06 +0000