aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Stub logger for testsAndrey Koleshko2013-06-061-0/+4
* 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | wonderfull => wonderfulVipul A M2013-06-021-1/+1
* | | | | | Merge pull request #10821 from kennyj/deprecations_4_1-2Rafael Mendonça França2013-06-0112-115/+22
|\ \ \ \ \ \
| * | | | | | Remove unnecessary testcase for instance level stored_attributes.kennyj2013-06-021-5/+0
| * | | | | | Remove instance level serialized_attributes setting was deprecated.kennyj2013-06-022-13/+0
| * | | | | | Remove instance level attr_readonly setting was deprecated.kennyj2013-06-022-12/+0
| * | | | | | Remove behavior that deals with a string as third argument of `add_index`, be...kennyj2013-06-022-38/+14
| * | | | | | Raise ArgumentError to fix Rails 4.1 deprecation warn message.kennyj2013-06-022-10/+8
| * | | | | | Remove Mime::Type#verify_request? and Mime::Type.browser_generated_types were...kennyj2013-06-023-37/+0
|/ / / / / /
* | | | | | Merge pull request #10814 from kennyj/deprecations_4_1Rafael Mendonça França2013-06-0125-479/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove ActionView::Template#mime_type was deprecated.kennyj2013-06-012-13/+0
| * | | | | Remove #sum with a block was deprecated.kennyj2013-06-013-21/+1
| * | | | | Remove ActionController::RecordIdentifier was deprecated.kennyj2013-06-015-99/+3
| * | | | | Remove action_controller/vendor/html-scanner.rb was deprecated.kennyj2013-06-011-5/+0
| * | | | | Remove :confirm and :disable_with options from ActionView::Helpers::FormTagHe...kennyj2013-06-012-69/+0
| * | | | | Remove link_to_function / button_to_function from ActionView::Helpers::Javasc...kennyj2013-06-012-84/+0