aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12006 from kassio/11605-render-with-context-formatRafael Mendonça França2013-08-2512-31/+16
|\
| * fix issue #11605Kassio Borges2013-08-2412-31/+16
|/
* Fix 1.8.7 incompatible respond_to_missingEugene Kalenkovich2013-08-181-2/+8
* Merge pull request #11930 from UncleGene/ties_testGuillermo Iguaran2013-08-181-4/+4
|\
| * Fix test incompatible with 1.8.7Eugene Kalenkovich2013-08-181-4/+4
|/
* Make `rake doc:guides` works again. Fix #10384.Teng Siong Ong2013-08-052-3/+3
* Merge pull request #11765 from kassio/load-fixtures-from-linked-folderRafael Mendonça França2013-08-054-3/+8
|\
| * Load fixtures from linked foldersKassio Borges2013-08-054-3/+8
|/
* Move changelog entry to the top [ci skip]Rafael Mendonça França2013-07-301-5/+8
* Fix broken testRafael Mendonça França2013-07-241-1/+1
* Tidy up the "Specified column type for quote_value" changesBen Woosley2013-07-242-3/+3
* Specified column type for quote_valueAlfred Wong2013-07-243-1/+24
* Merge pull request #11563 from 90yukke/fix-nomethoderror-on-non-attribute-equ...Rafael Mendonça França2013-07-233-2/+23
|\
| * Fix merge error when Equality LHS is non-attribute.90yukke2013-07-233-2/+23
|/
* Fix actionpack CHANGELOG entryRafael Mendonça França2013-07-221-1/+4
* Merge branch '3-2-14' into 3-2-stableRafael Mendonça França2013-07-2216-16/+24
|\
| * Fix activemodel CHANGELOGRafael Mendonça França2013-07-221-6/+1
| * Preparing for 3.2.14 releaseRafael Mendonça França2013-07-229-9/+9
| * Update CHANGELOG entryRafael Mendonça França2013-07-226-34/+6
| * Preparing for 3.2.14.rc2 releaseRafael Mendonça França2013-07-1616-17/+47
| * Use Ruby 1.8 syntaxRafael Mendonça França2013-07-151-1/+1
| * Merge pull request #11451 from jetthoughts/11450_do_not_resave_destroyed_asso...Yves Senn2013-07-153-0/+18
| * Preparing for 3.2.14.rc1 releaseRafael Mendonça França2013-07-1216-24/+26
* | Add test to prevent route reloading regressionAndrew White2013-07-211-0/+45
* | Merge pull request #11486 from wolframarnold/3-2-stable_fix_respond_to_missin...Rafael Mendonça França2013-07-183-0/+12
|\ \
| * | Add respond_to_missing? for TaggedLogging which is needed if another log abst...Wolfram Arnold2013-07-173-0/+12
* | | Merge pull request #10800 from 907th/fix-custom-message-for-assert_redirected_toRafael Mendonça França2013-07-173-2/+11
|\ \ \
| * | | Fix `assert_redirected_to` does not show user-supplied message.Alexey Chernenkov2013-07-183-2/+11
|/ / /
* | | Merge pull request #11468 from arunagw/removed_unsed_testCarlos Antonio da Silva2013-07-171-32/+0
|\| |
| * | Removed unused test fileArun Agrawal2013-07-171-32/+0
|/ /
* | Use Ruby 1.8 syntaxRafael Mendonça França2013-07-151-1/+1
* | Merge pull request #11451 from jetthoughts/11450_do_not_resave_destroyed_asso...Yves Senn2013-07-152-0/+9
|/
* Add missing require so that DateTime has the right superclassAndrew White2013-07-101-0/+1
* Return local time for backwards compatibilityAndrew White2013-07-093-10/+27
* Retain offset and fraction when using Time.at_with_coercionAndrew White2013-07-093-3/+51
* Do not shallow the original exception in exec_cacheRafael Mendonça França2013-07-092-1/+11
* Remove git dependecyRafael Mendonça França2013-07-081-1/+1
* Add license to the gemspecRafael Mendonça França2013-07-088-0/+19
* New changelog entries always on the top [ci skip]Rafael Mendonça França2013-07-061-4/+5
* Remove warning of assigned but unused variableRafael Mendonça França2013-07-061-1/+1
* Skip connection url test when the machine is using socket configuration.Rafael Mendonça França2013-07-061-0/+3
* Add missing requireSantiago Pastorino2013-07-021-0/+1
* Merge pull request #8881 from carsonreinke/3-2-stableRafael Mendonça França2013-07-013-2/+23
|\
| * Incorrectly providing program name the same as log message even when block is...Carson Reinke2013-07-013-2/+23
|/
* 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