aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | Conflicts: activerecord/test/cases/adapters/postgresql/bytea_test.rb
* Merge pull request #10841 from latortuga/fix-underscore-dependency-trackingDavid Heinemeier Hansson2013-06-042-14/+42
|\ | | | | Fix mismatching variable names when using an underscore
| * Fix mismatching variable names when using an underscoreDrew Ulmer2013-06-042-14/+42
| | | | | | | | | | | | | | | | The ERBTracker template digest helper class was using a regex to match render calls and it was incorrectly not matching against variables with underscores in the name. This caused it to use the wrong regex match data to populate the template dependency. Because underscore is a valid character for a variable, this fixes the ERBTracker to match it properly.
* | Merge pull request #10839 from gsamokovarov/clean-normalize_encoded_pathsRafael Mendonça França2013-06-041-11/+7
|\ \ | | | | | | Refactor ActionDispatch::Http::Parameters#normalize_encode_params
| * | 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 autoloads
| * | 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 replacing with Rails.application
| * | Removing use of subclassed application constant and instead using thewangjohn2013-06-038-50/+50
|/ / | | | | | | | | more agnostic Rails.application syntax. This means tests will be more portable, and won't rely on the existence of a particular subclass.
* | 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`.
| * | 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 ↵Guillermo Iguaran2013-06-032-2/+4
| | | | | | | | | | | | all directives
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behaviour doesn't actually make sense, the context of the child should not be affected by the parent. See #10492. This reverts commit 5f8274efe128ffeec8fa3179460f5167a078f007, reversing changes made to 81e837e810460d066a2e5fc5a795366ec8ab2313.
| * | | Merge pull request #10809 from wangjohn/fix_failing_railtie_testGuillermo Iguaran2013-06-031-1/+2
| |\ \ \ | | | | | | | | | | Fixing a failing railtie test by wrapping the command inside of sh -c
| | * | | Fixing a failing railtie test by using the ENV variable to specify awangjohn2013-05-311-1/+2
| | | | | | | | | | | | | | | | | | | | particular controller to search for in rake routes.
* | | | | The behavior we had in place in rc1 was actually to convert to DateTime and ↵David Heinemeier Hansson2013-06-031-2/+2
|/ / / / | | | | | | | | | | | | use <=> from there. Restore that.
* | | | Allow Date to be compared with Time (like it was possible to compare Time ↵David Heinemeier Hansson2013-06-032-0/+15
| | | | | | | | | | | | | | | | with Date)
* | | | Merge pull request #10827 from trevorturk/patch-upgrade-guideDavid Heinemeier Hansson2013-06-031-16/+39
|\ \ \ \ | | | | | | | | | | Improve upgrade guide documentation about the PUT->PATCH change
| * | | | 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`.
| * | | | 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 already in 'rubygems/package_task'
| * | | | | No need to load 'rake/packagetask' as it's alreadyArun Agrawal2013-06-024-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in 'rubygems/package_task'
* | | | | | Merge pull request #10824 from vipulnsward/wonderfulGuillermo Iguaran2013-06-021-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | wonderfull => wonderful
| * | | | | 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 some deprecated methods in Rails 4.1 again.
| * | | | | | 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`, ↵kennyj2013-06-022-38/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because this was deprecated. Some testcases is failed, so I replaced nil to empty hash in add_reference.
| * | | | | | 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 ↵kennyj2013-06-023-37/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | were deprecated.
* | | | | | Merge pull request #10814 from kennyj/deprecations_4_1Rafael Mendonça França2013-06-0125-479/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove some deprecation methods / options / files.
| * | | | | 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 ↵kennyj2013-06-012-69/+0
| | | | | | | | | | | | | | | | | | | | | | | | ActionView::Helpers::FormTagHelper were deprecated.
| * | | | | Remove link_to_function / button_to_function from ↵kennyj2013-06-012-84/+0
| | | | | | | | | | | | | | | | | | | | | | | | ActionView::Helpers::JavascriptHelper were deprecated.
| * | | | | Remove :confirm and :disable_with options for ↵kennyj2013-06-012-93/+0
| | | | | | | | | | | | | | | | | | | | | | | | ActionView::Helpers::UrlHelper#link_to and #button_to were deprecated.
| * | | | | Remove active_support/testing/pending.rb was deprecated.kennyj2013-06-013-27/+0
| | | | | |
| * | | | | Remove ActiveSupport::Benchmarkable#silence was deprecated.kennyj2013-06-012-42/+0
| | | | | |
| * | | | | Remove active_support/json/variable was deprecated.kennyj2013-06-013-26/+0
|/ / / / /
* | / / / revises the documentation of ActiveRecord::Relation#find_or_create_by [ci skip]Xavier Noria2013-06-011-14/+38
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Inspect uses double quotes. * Inspect puts a hash as in #<User ...>. * Documents the return value, and makes explicit it can be an invalid record. * Documents the method is not atomic. * Documents a way to handle UNIQUE contraint violations in the event of a race condition. * Removes the "Examples" header according to our guidelines.
* | | | rewrites AR's reload documentationXavier Noria2013-05-311-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * It is no longer true that options are passed to find. * Documents that ActiveRecord::RecordNotFound may be raised. * Documents that the reload happens in-place. * Documents that caches are wiped. * Documents that the method returns self. * Documents a couple of use cases.
* | | | Add propery docs to ActionDispatch::Response [ci skip]Steve Klabnik2013-05-301-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After some discussion on Twitter with @skud, the documentation on ActionDispatch::Response is a bit sparse. This class is useful when you're writing tests, as often you want to assert various things about the response that's coming back. Better docs would make this easier for people new to testing in Rails. I only added some descriptions for various properties that were defined, and mostly just a sentence or two. Most of these things are familliar if you're working with HTTP, but some words is better than no words at all. Hopefully further commits will fix up things that aren't just documentation.
* | | | Merge pull request #10783 from wangjohn/rake_routes_additional_environmentRafael Mendonça França2013-05-301-0/+12
|\ \ \ \ | | | | | | | | | | Adding the ability to filter routes by the verb
| * | | | Adding a test to make sure that using rake routes with the CONTROLLERwangjohn2013-05-291-0/+12
| | |_|/ | |/| | | | | | | | | | environment works correctly.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-07 17:24:59 +0000