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

	Commit message (Collapse)	Author	Age	Files	Lines
*	When logging Cache key, in debug mode, also log namespace, to create the ↵	Avner Cohen	2015-06-23	2	-1/+14
\| \| \| \|	full key that actually used by the underline cache implementation
*	Merge pull request #20674 from yui-knk/fix/guide2	Rafael Mendonça França	2015-06-23	1	-1/+1
\|\ \| \| \| \|	[ci skip] Make clear what `this method` is
\| *	[ci skip] Make clear what `this method` is	yui-knk	2015-06-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In this sentence, there are three candidates of `this method` * default_url_options * url_for * helper method(s) so make it clear.
* \|	A few documentation fixes [ci skip]	Robin Dupret	2015-06-23	3	-8/+8
\| \|
* \|	Remove the paragraph about Rails::Server#middleware	Robin Dupret	2015-06-23	1	-18/+0
\|/ \| \| \| \| \| \| \| \| \| \|	As of 56903585, the Rack::ContentLength middleware isn't included by default anymore. The only remaining middleware is Rack::Lock ; since it's only included when using WEBrick, it's certainly not worth documenting it in the guides. [ci skip]
*	Merge pull request #20673 from aditya-kapoor/correct-preload-doc	Yves Senn	2015-06-23	1	-1/+1
\|\ \| \| \| \| \| \|	[ci skip] correct for ActiveRecord::Associations::Preloader
\| *	[ci skip] correct for ActiveRecord::Associations::Preloader:	Aditya Kapoor	2015-06-23	1	-1/+2
\| \|
* \|	docs, add missing closing bracket. [ci skip]	Yves Senn	2015-06-23	1	-1/+1
\|/
*	Merge pull request #20552 from jamesdabbs/belongs-to-polymorphic-force-reload	Yves Senn	2015-06-23	3	-1/+10
\|\ \| \| \| \| \| \|	Fix `undefined method uncached` for polymorphic belongs_to #20426
\| *	Fix `undefined method uncached` for polymorphic belongs_to #20426	James Dabbs	2015-06-13	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unitialized polymorphic `belongs_to` associations raise an error while attempting to reload, as they attempt to make an uncached reload, but don't have a klass to fetch uncachedly. In this case, `loaded?` should be `false` anyway.
* \|	Merge pull request #20545 from dcrec1/20541	Yves Senn	2015-06-23	3	-3/+39
\|\ \ \| \| \| \| \| \| \| \| \|	thrown ActiveRecord::AssociationTypeMismatch when assigning a wrong value for a namespaced association
\| * \|	thrown ActiveRecord::AssociationTypeMismatch when assigning a wrong value ↵	Diego Carrion	2015-06-22	3	-3/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for a namespaced association fixes #20541
* \| \|	Merge pull request #20667 from y-yagi/do_not_show_failed_messages	Rafael Mendonça França	2015-06-22	2	-3/+10
\|\ \ \ \| \| \| \| \| \| \| \|	do not show "Failed tests" message when a failed test is not
\| * \| \|	do not show "Failed tests" message when a failed test is not	yuuji.yaginuma	2015-06-23	2	-3/+10
\| \| \| \|
* \| \| \|	Merge pull request #20664 from vngrs/remove_mistaken_end_from_doc	Claudio B.	2015-06-22	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove mistaken end from controller_path doc [ci skip]
\| * \| \| \|	Remove mistaken end from controller_path doc [ci skip]	Mehmet Emin İNAÇ	2015-06-22	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #19431 from hmarr/head-routing	Rafael Mendonça França	2015-06-22	2	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Respect routing precedence for HEAD requests
\| * \| \| \|	Respect routing precedence for HEAD requests	Harry Marr	2015-03-20	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the issue described in #18764 - prevents Rack middleware from swallowing up HEAD requests that should have been matched by a higher-precedence `get` route, but still allows Rack middleware to respond to HEAD requests.
* \| \| \| \|	Merge pull request #20665 from vngrs/add_nodoc_to_validations_helpers	Rafael Mendonça França	2015-06-22	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add nodoc to the Validations::Helpers [ci skip]
\| * \| \| \| \|	Add nodoc to the Validations::Helpers [ci skip]	Mehmet Emin İNAÇ	2015-06-22	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #20663 from andreynering/patch-1	Rafael Mendonça França	2015-06-22	1	-2/+2
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Minor fixes [ci skip]
\| * \| \| \|	Minor fixes [ci skip]	Andrey Nering	2015-06-22	1	-2/+2
\|/ / / /
* \| \| \|	docs, :scissors: wrongly placed heading. [ci skip]	Yves Senn	2015-06-22	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The heading "Active Model Length Validator" was shown on the "ActiveModel::Validations" page without any text following it.
* \| \| \|	refactor, don't duplicate presence validator logic.	Yves Senn	2015-06-22	1	-10/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a small refactoring that simplifies the Active Record specific lenght validator.
* \| \| \|	docs, update Active Model reference for AR length validator. [ci skip]	Yves Senn	2015-06-22	1	-1/+4
\| \| \| \|
* \| \| \|	AR absence validator respects `marked_for_destruction?`. Closes #20449.	Yves Senn	2015-06-22	4	-0/+106
\| \|/ / \|/\| \| \| \| \| \| \| \|	Associated objects that were marked for destruction are considered absent.
* \| \|	Merge pull request #20656 from repinel/move-validations-helper-methods	Yves Senn	2015-06-22	2	-10/+13
\|\ \ \ \| \| \| \| \| \| \| \|	Move the validations HelperMethods to its own file
\| * \| \|	Move the validations HelperMethods to its own file	Roque Pinel	2015-06-21	2	-10/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #11209 [Roque Pinel & Steven Yang]
* \| \| \|	Merge pull request #20659 from ↵	Yves Senn	2015-06-22	1	-2/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	vngrs/strong_parameters_unpermitted_parameters_wrong_doc_fix Fix the documentation about ActionController::UnpermittedParameters [ci skip]
\| * \| \| \|	Fix the documentation about ActionController::UnpermittedParameters [ci skip]	Mehmet Emin İNAÇ	2015-06-22	1	-2/+4
\|/ / / /
* \| \| \|	Merge pull request #20655 from y-yagi/remove_unused_variable	Richard Schneeman	2015-06-21	1	-1/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	remove unused variable in reporter test
\| * \| \| \|	remove unused variable in reporter test	yuuji.yaginuma	2015-06-22	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Merge pull request #20658 from vngrs/strong_parameters_parameter_wrong_doc_fix	Richard Schneeman	2015-06-21	1	-5/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix the documentation about ActionController::ParameterMissing [ci skip]
\| * \| \| \| \|	Fix the documentation about ActionController::ParameterMissing [ci skip]	Mehmet Emin İNAÇ	2015-06-22	1	-5/+5
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #20654 from repinel/remove-duplicate-private	Richard Schneeman	2015-06-21	1	-2/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Remove duplicate private statement
\| * \| \| \|	Remove duplicate private statement	Roque Pinel	2015-06-21	1	-2/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2015-06-21	8	-11/+9
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: guides/source/configuring.md
\| * \| \| \|	Remove broken links	Gaurish Sharma	2015-06-21	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	[ci skip] Fix to Fixed-width Font	yui-knk	2015-06-14	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LookupContext is class name
\| * \| \| \|	[ci skip] Add '.'	yui-knk	2015-06-14	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	[ci skip] Add `.`	yui-knk	2015-06-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Remove misplaced period on "Configuring" guide.	Hendy Tanata	2015-06-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	[ci skip] Fix minutes to seconds in `select_second`	yui-knk	2015-06-09	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is same type commit of https://github.com/rails/rails/pull/20463
\| * \| \| \|	[ci skip] Fix order to match options order	yui-knk	2015-06-07	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	applies project style guidelines	Xavier Noria	2015-06-20	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Just saw these in passing while reading this file.
* \| \| \| \|	removes unnecessary backslashes in regexps	Xavier Noria	2015-06-20	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Colons are not metacharacters.
* \| \| \| \|	Merge pull request #20636 from dcrec1/isolated_test	Yves Senn	2015-06-20	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	fix test not failing when executed isolated
\| * \| \| \|	fix test not failing when executed isolated	Diego Carrion	2015-06-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the test was created in 7659fb6 the fixtures were added in c092dbe
* \| \| \| \|	Include `Enumerable` in `ActiveRecord::Relation`	Sean Griffin	2015-06-19	5	-37/+21
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After discussing, we've decided it makes more sense to include it. We're already forwarding every conflicting method to `to_a`, and there's no conflation of concerns. `Enumerable` has no mutating methods, and it just allows us to simplify the code. No existing methods will have a change in behavior. Un-overridden Enumerable methods will simply delegate to `each`. [Sean Griffin & bogdan]
* \| \| \|	Use `Enumerable#sum` on `ActiveRecord::Relation` when a block is given	Sean Griffin	2015-06-19	3	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This matches our behavior in other cases where useful enumerable methods might have a different definition in `Relation`. Wanting to actually enumerate over the records in this case is completely reasonable, and wanting `.sum` is reasonable for the same reason it is on `Enumerable` in the first place.