rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #10839 from gsamokovarov/clean-normalize_encoded_paths	Rafael Mendonça França	2013-06-04	1	-11/+7
\|\ \| \| \| \|	Refactor ActionDispatch::Http::Parameters#normalize_encode_params
\| *	Refactor ActionDispatch::Http::Parameters#normalize_encode_params	Genadi Samokovarov	2013-06-04	1	-11/+7
\| \|
* \|	Merge pull request #10838 from gsamokovarov/routing-autoload_under	Rafael Mendonça França	2013-06-04	1	-5/+7
\|\ \ \| \| \| \| \| \|	DRY-up ActionDispatch::Routing autoloads
\| * \|	Dry-up ActionDispatch::Routing autoloads	Genadi Samokovarov	2013-06-04	1	-5/+7
\| \|/
* \|	Merge pull request #10832 from wangjohn/removing_use_of_application_constant	José Valim	2013-06-03	8	-50/+50
\|\ \ \| \| \| \| \| \|	Removing use of subclassed application constant and replacing with Rails.application
\| * \|	Removing use of subclassed application constant and instead using the	wangjohn	2013-06-03	8	-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_transformation	Rafael Mendonça França	2013-06-03	3	-6/+25
\|\ \ \| \| \| \| \| \|	Prevent side effects in `Hash#with_indifferent_access`.
\| * \|	Prevent side effects in `Hash#with_indifferent_access`.	Yves Senn	2013-05-29	3	-6/+25
\| \| \|
* \| \|	Replace comment about Sprockets stub directive with a link to README about ↵	Guillermo Iguaran	2013-06-03	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \|	all directives
* \| \|	Merge branch 'master' of github.com:rails/rails	David Heinemeier Hansson	2013-06-03	4	-20/+4
\|\ \ \
\| * \| \|	Revert "Merge pull request #4490 from EmmanuelOga/master"	José Valim	2013-06-04	3	-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_test	Guillermo Iguaran	2013-06-03	1	-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 a	wangjohn	2013-05-31	1	-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 Hansson	2013-06-03	1	-2/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	use <=> from there. Restore that.
* \| \| \|	Allow Date to be compared with Time (like it was possible to compare Time ↵	David Heinemeier Hansson	2013-06-03	2	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with Date)
* \| \| \|	Merge pull request #10827 from trevorturk/patch-upgrade-guide	David Heinemeier Hansson	2013-06-03	1	-16/+39
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Improve upgrade guide documentation about the PUT->PATCH change
\| * \| \| \|	Improve upgrade guide documentation about the PUT->PATCH change	Trevor Turk	2013-06-03	1	-16/+39
\|/ / / /
* \| \| \|	Merge pull request #10747 from javan/patch-1	David Heinemeier Hansson	2013-06-03	1	-0/+18
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Add note about upgrading custom routes from `put` to `patch`.
\| * \| \| \|	Add note about upgrading custom routes from `put` to `patch`.	Javan Makhmali	2013-05-24	1	-0/+18
\| \| \| \| \|
* \| \| \| \|	Merge pull request #10825 from arunagw/remove-rake-packagetask-load	Guillermo Iguaran	2013-06-02	4	-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 already	Arun Agrawal	2013-06-02	4	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in 'rubygems/package_task'
* \| \| \| \| \|	Merge pull request #10824 from vipulnsward/wonderful	Guillermo Iguaran	2013-06-02	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	wonderfull => wonderful
\| * \| \| \| \|	wonderfull => wonderful	Vipul A M	2013-06-02	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #10821 from kennyj/deprecations_4_1-2	Rafael Mendonça França	2013-06-01	12	-115/+22
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove some deprecated methods in Rails 4.1 again.
\| * \| \| \| \| \|	Remove unnecessary testcase for instance level stored_attributes.	kennyj	2013-06-02	1	-5/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove instance level serialized_attributes setting was deprecated.	kennyj	2013-06-02	2	-13/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove instance level attr_readonly setting was deprecated.	kennyj	2013-06-02	2	-12/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove behavior that deals with a string as third argument of `add_index`, ↵	kennyj	2013-06-02	2	-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.	kennyj	2013-06-02	2	-10/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove Mime::Type#verify_request? and Mime::Type.browser_generated_types ↵	kennyj	2013-06-02	3	-37/+0
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	were deprecated.
* \| \| \| \| \|	Merge pull request #10814 from kennyj/deprecations_4_1	Rafael Mendonça França	2013-06-01	25	-479/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Remove some deprecation methods / options / files.
\| * \| \| \| \|	Remove ActionView::Template#mime_type was deprecated.	kennyj	2013-06-01	2	-13/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Remove #sum with a block was deprecated.	kennyj	2013-06-01	3	-21/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove ActionController::RecordIdentifier was deprecated.	kennyj	2013-06-01	5	-99/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Remove action_controller/vendor/html-scanner.rb was deprecated.	kennyj	2013-06-01	1	-5/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Remove :confirm and :disable_with options from ↵	kennyj	2013-06-01	2	-69/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionView::Helpers::FormTagHelper were deprecated.
\| * \| \| \| \|	Remove link_to_function / button_to_function from ↵	kennyj	2013-06-01	2	-84/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionView::Helpers::JavascriptHelper were deprecated.
\| * \| \| \| \|	Remove :confirm and :disable_with options for ↵	kennyj	2013-06-01	2	-93/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionView::Helpers::UrlHelper#link_to and #button_to were deprecated.
\| * \| \| \| \|	Remove active_support/testing/pending.rb was deprecated.	kennyj	2013-06-01	3	-27/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Remove ActiveSupport::Benchmarkable#silence was deprecated.	kennyj	2013-06-01	2	-42/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Remove active_support/json/variable was deprecated.	kennyj	2013-06-01	3	-26/+0
\|/ / / / /
* \| / / /	revises the documentation of ActiveRecord::Relation#find_or_create_by [ci skip]	Xavier Noria	2013-06-01	1	-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 documentation	Xavier Noria	2013-05-31	1	-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 Klabnik	2013-05-30	1	-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_environment	Rafael Mendonça França	2013-05-30	1	-0/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Adding the ability to filter routes by the verb
\| * \| \| \|	Adding a test to make sure that using rake routes with the CONTROLLER	wangjohn	2013-05-29	1	-0/+12
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	environment works correctly.
* \| \| \|	Merge pull request #10805 from pilaf/master	Steve Klabnik	2013-05-30	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix word order in documentation for with_lock [ci skip]
\| * \| \| \|	Fix word order in documentation for with_lock	Pedro Fayolle	2013-05-30	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #10803 from gsamokovarov/extract-deep-munge	Rafael Mendonça França	2013-05-30	3	-18/+27
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Extract ActionDispatch::Request#deep_munge
\| * \| \| \|	Extract ActionDispatch::Request#deep_munge	Genadi Samokovarov	2013-05-30	3	-18/+27
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionDispatch::Request#deep_munge was introduced as a private method, but was turned into a public one for the use of ActionDispatch::ParamsParser. I have extracted it into ActionDispatch::Request::Utils, so it does not get mixed up with the Request public methods.