aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* unify duplicate CHANGELOG entryYves Senn2013-06-271-6/+2
* Merge pull request #9173 from senny/backport_perftest_fixYves Senn2013-06-278-8/+23
|\
| * clear ARGV to prevent mintest autorun errors:Yves Senn2013-06-273-0/+8
| * Backport rails/rails-perftest#2 to fix rake test:benchmarkYves Senn2013-06-277-8/+15
|/
* Merge pull request #11019 from tkhr/test_case_for_issue_10393Yves Senn2013-06-253-1/+29
|\
| * Allow global override of default STI inheritance columnchapmajs2013-06-263-1/+29
* | build fix, fall back to old hash syntaxYves Senn2013-06-261-3/+3
|/
* Merge pull request #9893 from JonRowe/add_test_to_assert_association_doesnt_o...Yves Senn2013-06-251-0/+13
|\
| * test case to assert that associations do not overwrite after create, fixes #9310Jon Rowe2013-03-241-0/+13
* | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2013-06-251-5/+6
* | Merge pull request #10373 from janko-m/fix-store-accessorCarlos Antonio da Silva2013-06-253-1/+13
|\ \
| * | Fix ActiveRecord::Store not tracking changesJanko Marohnić2013-04-293-1/+13
* | | Revert "Revert "Merge pull request #10901 from armstrjare/fix_query_null_fore...Yves Senn2013-06-253-1/+43
* | | Use old style hash syntax for 3-2-stableAndrew White2013-06-251-2/+2
* | | Fix shorthand routes where controller and action are in the scopeAndrew White2013-06-253-0/+30
* | | Add CHANGELOG entry for #10971Rafael Mendonça França2013-06-241-0/+14
* | | Merge pull request #10971 from dtaniwaki/escape_link_to_unlessRafael Mendonça França2013-06-242-1/+6
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:48:46 +0000