aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10875 from vipulnsward/fix_some_typos_in_asCarlos Antonio da Silva2013-06-072-2/+2
|\
| * Fix some typosVipul A M2013-06-072-2/+2
* | Merge pull request #10874 from rlivsey/patch-1Andrew White2013-06-071-1/+1
|\ \
| * | Docfix: Use public interface instead of setting instance variablesRichard Livsey2013-06-071-1/+1
|/ /
* | Merge pull request #10561 from Empact/nix-throwresultJon Leighton2013-06-076-23/+35
|\ \
| * | Rather than raising ThrowResult when construct_limited_ids_conditions comes u...Ben Woosley2013-05-103-21/+15
| * | Make NullRelation a bit more like a real relation by returning 0 for #calcula...Ben Woosley2013-05-102-3/+8
| * | No point in memoizing a simple literal string.Ben Woosley2013-05-101-1/+1
| * | Add coverage for the fact that pluck without an argument returns all the tabl...Ben Woosley2013-05-101-0/+5
| * | Fix that #pluck wasn't rescuing ThrowResult, meaning it would blow up when fa...Ben Woosley2013-05-102-0/+8
* | | Merge pull request #10871 from arunagw/lifo-to-railsXavier Noria2013-06-063-5/+5
|\ \ \
| * | | As we have moved to rails/docrails from lifo/docrailsArun Agrawal2013-06-063-5/+5
|/ / /
* | | registers recent patch in the railties CHANGELOGXavier Noria2013-06-061-0/+4
* | | clearing autoloaded constants triggers routes reloading [Fixes #10685]Xavier Noria2013-06-062-9/+61
* | | Merge pull request #10867 from iHiD/patch-1Xavier Noria2013-06-061-0/+2
|\ \ \ | |_|/ |/| |
| * | Add info about contributing to docs to CONTRIBUTING.mdJeremy Walker2013-06-061-0/+2
|/ /
* | Merge pull request #10851 from arunagw/fixing_build_pending_migrationAaron Patterson2013-06-051-0/+1
|\ \
| * | Fixing build for not checking migrationArun Agrawal2013-06-051-0/+1
|/ /
* | Merge pull request #10850 from arunagw/build_fix_null_migrationAaron Patterson2013-06-051-3/+3
|\ \
| * | Fix Build. Changing constructor.Arun Agrawal2013-06-051-3/+3
|/ /
* | Merge pull request #10482 from scudco/10432-fix-add-column-with-arrayAaron Patterson2013-06-053-0/+34
|\ \
| * | Fixes #10432 add_column not creating array columns in PostgreSQLAdam Anderson2013-06-043-0/+34
* | | only check pending migrations if there are new filesAaron Patterson2013-06-051-2/+25
* | | Fix #10789. Now at last ::Logger doesn't support #silence method .kennyj2013-06-052-3/+10
* | | the typecast value should be passed to the serializer. fixes #10830Aaron Patterson2013-06-052-6/+5
* | | adding a test for #10830Aaron Patterson2013-06-051-0/+18
* | | Merge pull request #10841 from latortuga/fix-underscore-dependency-trackingDavid Heinemeier Hansson2013-06-042-14/+42
|\ \ \
| * | | Fix mismatching variable names when using an underscoreDrew Ulmer2013-06-042-14/+42
* | | | Merge pull request #10839 from gsamokovarov/clean-normalize_encoded_pathsRafael Mendonça França2013-06-041-11/+7
|\ \ \ \
| * | | | Refactor ActionDispatch::Http::Parameters#normalize_encode_paramsGenadi Samokovarov2013-06-041-11/+7
* | | | | Merge pull request #10838 from gsamokovarov/routing-autoload_underRafael Mendonça França2013-06-041-5/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Dry-up ActionDispatch::Routing autoloadsGenadi Samokovarov2013-06-041-5/+7
| |/ / /
* | | | Merge pull request #10832 from wangjohn/removing_use_of_application_constantJosé Valim2013-06-038-50/+50
|\ \ \ \ | |_|/ / |/| | |
| * | | Removing use of subclassed application constant and instead using thewangjohn2013-06-038-50/+50
|/ / /
* | | Merge pull request #10784 from senny/10526_prevent_key_transformationRafael Mendonça França2013-06-033-6/+25
|\ \ \
| * | | Prevent side effects in `Hash#with_indifferent_access`.Yves Senn2013-05-293-6/+25
* | | | Replace comment about Sprockets stub directive with a link to README about al...Guillermo Iguaran2013-06-032-2/+4
* | | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2013-06-034-20/+4
|\ \ \ \
| * | | | Revert "Merge pull request #4490 from EmmanuelOga/master"José Valim2013-06-043-19/+2
| * | | | Merge pull request #10809 from wangjohn/fix_failing_railtie_testGuillermo Iguaran2013-06-031-1/+2
| |\ \ \ \
| | * | | | Fixing a failing railtie test by using the ENV variable to specify awangjohn2013-05-311-1/+2
* | | | | | The behavior we had in place in rc1 was actually to convert to DateTime and u...David Heinemeier Hansson2013-06-031-2/+2
|/ / / / /
* | | | | Allow Date to be compared with Time (like it was possible to compare Time wit...David Heinemeier Hansson2013-06-032-0/+15
* | | | | Merge pull request #10827 from trevorturk/patch-upgrade-guideDavid Heinemeier Hansson2013-06-031-16/+39
|\ \ \ \ \
| * | | | | Improve upgrade guide documentation about the PUT->PATCH changeTrevor Turk2013-06-031-16/+39
|/ / / / /
* | | | | Merge pull request #10747 from javan/patch-1David Heinemeier Hansson2013-06-031-0/+18
|\ \ \ \ \
| * | | | | Add note about upgrading custom routes from `put` to `patch`.Javan Makhmali2013-05-241-0/+18
* | | | | | Merge pull request #10825 from arunagw/remove-rake-packagetask-loadGuillermo Iguaran2013-06-024-4/+0
|\ \ \ \ \ \
| * | | | | | No need to load 'rake/packagetask' as it's alreadyArun Agrawal2013-06-024-4/+0
* | | | | | | Merge pull request #10824 from vipulnsward/wonderfulGuillermo Iguaran2013-06-021-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |