aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added test for assets:precompile for index filesDmitry Vorotilin2012-05-011-0/+9
* Fix #3993 assets:precompile task does not detect index filesDmitry Vorotilin2012-05-011-0/+3
* Correcting some confusion. Pago Pago is part of American Samoa, not Samoa.Dave Gerton2012-04-301-2/+4
* Failing test for #6034Piotr Sarnacki2012-04-301-0/+20
* fix the Flash middleware loading the session on every request (very dangerous...Will Bryant2012-04-302-7/+3
* Add note about using 303 See Other for XHR requests other than GET/POSTAndrew White2012-04-301-0/+10
* Merge pull request #5922 from rafaelfranca/deprecate_javascript_helpersJeremy Kemper2012-04-299-18/+40
|\
| * Add release data to Rails 3.2.3Rafael Mendonça França2012-04-305-5/+5
| * Add CHANGELOG entry.Rafael Mendonça França2012-04-301-1/+6
| * Deprecate link_to_function and button_to_function helpersRafael Mendonça França2012-04-302-12/+28
| * Add missing require when helpers are used in isolationRafael Mendonça França2012-04-301-0/+1
|/
* Restore interpolation of path option in redirect routesAndrew White2012-04-292-1/+50
* Add missing require from b608cdd64c95d0d16eb98d86562e22f3b01be9e3Andrew White2012-04-291-0/+1
* Escape interpolated params when redirecting - fixes #5688Andrew White2012-04-292-1/+34
* Merge pull request #6051 from rafaelfranca/fix_buildJosé Valim2012-04-292-3/+3
|\
| * Remove warning of unused variableRafael Mendonça França2012-04-291-1/+1
| * Fix the build.Rafael Mendonça França2012-04-291-2/+2
|/
* Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-292-8/+58
* Lazy load `default_form_builder` if it's passed as a stringPiotr Sarnacki2012-04-284-2/+27
* Allow Thor 0.15 and 1.0, to be released shortlytomhuda2012-04-281-1/+5
* Merge pull request #6038 from arunagw/warning_removed_3-2-stablePiotr Sarnacki2012-04-281-1/+0
|\
| * Remove circular require of time/zonesOscar Del Ben2012-04-291-1/+0
|/
* Merge pull request #6022 from sikachu/3-2-stable-record_tag_backportAaron Patterson2012-04-272-2/+8
|\
| * Do not mutate options hashCarlos Antonio da Silva2012-04-272-2/+8
|/
* Merge pull request #4528 from j-manu/log-tailer-fixAaron Patterson2012-04-271-3/+7
* fix number_to_human docs [ci skip]Vijay Dev2012-04-261-2/+2
* Merge pull request #5971 from carlosantoniodasilva/fix-build-3-2Jeremy Kemper2012-04-241-1/+1
|\
| * Add extra order clause to fix failing test on Ruby 1.8.7Carlos Antonio da Silva2012-04-241-1/+1
|/
* Merge pull request #5968 from sikachu/3-2-stable-backportJeremy Kemper2012-04-242-3/+9
|\
| * Fix build. It seems that the Mocha's behavior were changed.kennyj2012-04-242-3/+9
|/
* Merge pull request #5946 from sikachu/3-2-stable-fix-merge-conflictSantiago Pastorino2012-04-231-9/+11
|\
| * Fix broken test from the earlier merge conflictPrem Sichanugrist2012-04-231-9/+11
|/
* Merge pull request #5866 from tiegz/minor_fixes_3-2-stableAaron Patterson2012-04-232-42/+27
|\
| * converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-162-47/+23
| * catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-162-1/+10
* | Merge pull request #5919 from joevandyk/rake-dsl-fixJeremy Kemper2012-04-231-1/+1
|\ \
| * | Only include Rake::DSL if it's defined.Joe Van Dyk2012-04-211-1/+1
* | | Merge pull request #5936 from arunagw/other_readme_fixesVijay Dev2012-04-236-6/+6
|\ \ \
| * | | Updated other README to point 3-2-stableArun Agrawal2012-04-236-6/+6
* | | | Merge pull request #5935 from arunagw/readme_fixes_3-2-stableVijay Dev2012-04-231-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | ARes URL should be pointed to 3-2-stable tree not master.Arun Agrawal2012-04-231-1/+1
|/ / /
* | | Merge pull request #5896 from sferik/revert_5861Jeremy Kemper2012-04-212-4/+18
|\ \ \ | |/ / |/| |
| * | Use `Object#respond_to?` to determine which MultiJson API to useErik Michaels-Ober2012-04-181-3/+17
| * | Revert "multi_json is restricted to < 1.3 "Erik Michaels-Ober2012-04-181-1/+1
* | | Be sure to correctly fetch PK name from MySQL even if the PK has some custom ...Akira Matsuda2012-04-192-1/+31
* | | Merge pull request #5898 from benedikt/3-2-stableJeremy Kemper2012-04-196-8/+40
|\ \ \ | |/ / |/| |
| * | Removes unneeded caching from ActiveRecord::Base.relationBenedikt Deicke2012-04-191-4/+3
| * | Revert "Revert "Fix #5667. Preloading should ignore scoping.""Benedikt Deicke2012-04-192-2/+9
| * | Adds test to check that circular preloading does not modify Model.unscoped (a...Benedikt Deicke2012-04-193-4/+26
| * | Removes caching from ActiveRecord::Core::ClassMethods#relationBenedikt Deicke2012-04-192-2/+6
|/ /