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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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.
* \|	Merge pull request #20117 from jfine/action-mailer-smtp-settings-update	Yves Senn	2015-06-19	1	-1/+1
\|\ \ \| \| \| \| \| \|	Add openssl_verify_mode and sync other smtp_settings with API docs [ci skip]
\| * \|	Add openssl_verify_mode and sync other smtp_settings with API docs	Jared Fine	2015-05-11	1	-1/+1
\| \| \|
* \| \|	Merge pull request #20259 from rastasheep/rastasheep-patch-1	Yves Senn	2015-06-19	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update documentation for ActiveRecord::Migration#remove_index
\| * \| \|	Fix typo [ci skip]	Aleksandar Diklic	2015-05-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`remove_index` works with multiple column names as `add_index`
* \| \| \|	Merge pull request #20605 from dcrec1/assert_file	Yves Senn	2015-06-19	4	-2/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	assert_file understands paths with special characters
\| * \| \| \|	assert_file understands paths with special characters	Diego Carrion	2015-06-18	3	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #20042
* \| \| \| \|	Merge pull request #19843 from marshall-lee/explain_cte_queries	Yves Senn	2015-06-19	3	-1/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let WITH (CTE) queries be explainable Conflicts: activerecord/CHANGELOG.md
\| * \| \| \| \|	Let WITH (CTE) queries be explainable	Vladimir Kochnev	2015-05-28	3	-1/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #20630 from y-yagi/fix_references_migration_example	Zachary Scott	2015-06-18	1	-4/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	correct example output of references migration [ci skip]
\| * \| \| \| \| \|	correct example output of references migration [ci skip]	yuuji.yaginuma	2015-06-19	1	-4/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this behavior was changed in 99a6f9e60ea55924b44f894a16f8de0162cf2702
* \| \| \| \| \|	Nitpick :nail_care: [ci skip]	Zachary Scott	2015-06-18	1	-1/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Autoload ActiveRecord::RecordInvalid	Rafael Mendonça França	2015-06-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #20626
* \| \| \| \| \|	Merge pull request #20549 from maurogeorge/distance_of_time_in_words-rdoc	Zachary Scott	2015-06-18	1	-0/+20
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add RDoc about scope option on distance_of_time_in_words
\| * \| \| \| \| \|	Add RDoc about scope option on distance_of_time_in_words	Mauro George	2015-06-18	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge pull request #20575 from prathamesh-sonpatki/doc-xml-disallowed-types	Zachary Scott	2015-06-18	1	-1/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added documentation about passing custom disallowed types to Hash#from_xml [ci skip]
\| * \| \| \| \| \| \|	Added documentation about passing custom disallowed types to Hash#from_xml ↵	Prathamesh Sonpatki	2015-06-18	1	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge pull request #20618 from vngrs/fix_railties_tests	Eileen M. Uchitelle	2015-06-18	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix railties tests
\| * \| \| \| \| \| \| \|	fix railties tests	Mehmet Emin İNAÇ	2015-06-18	1	-2/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Tiny documentation fixes [ci skip]	Robin Dupret	2015-06-18	2	-10/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #20054 from trosborn/master	Robin Dupret	2015-06-18	1	-77/+107
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updates caching guide to reflect current Rails capabilities [ci skip]
\| * \| \| \| \| \| \| \|	updates caching guide to reflect current Rails capabilities [ci skip]	Thomas Osborn	2015-06-17	1	-77/+107
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #20614 from y-yagi/remove_rails_rack_debugger_from_guide	Zachary Scott	2015-06-17	1	-3/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove `Rails::Rack::Debugger` from guides [ci skip]
\| * \| \| \| \| \| \| \| \|	remove `Rails::Rack::Debugger` from guides [ci skip]	yuuji.yaginuma	2015-06-18	1	-3/+1
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails::Rack::Debugger was removed in 93559da4826546d07014f8cfa399b64b4a143127
* \| \| \| \| \| \| \| \|	Remove ContentLength middleware from the defaults.	Aaron Patterson	2015-06-17	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ContentLength is not part of the rack SPEC since rack/rack@86ddc7a6ec68d7b6951c2dbd07947c4254e8bc0d If you want it, just add it as a middleware in your config.