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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-07-07	13	-152/+199
\|\
\| *	add :nodoc: to internal implementations of AM::Validator [ci skip]	Francesco Rodriguez	2012-07-06	2	-3/+3
\| *	update ActiveModel::Serialization documentation [ci skip]	Francesco Rodriguez	2012-07-06	1	-14/+36
\| *	fix syntax of AM::Validations::HelperMethods examples [ci skip]	Francesco Rodriguez	2012-07-05	4	-6/+6
\| *	update ActiveModel::Validations::HelperMethods documentation [ci skip]	Francesco Rodriguez	2012-07-05	8	-130/+141
\| *	update ActiveModel::Conversion documentation [ci skip]	Francesco Rodriguez	2012-07-04	1	-3/+15
\| *	Changed attr_accessible example to reflect grouped roles	Laknath	2012-07-01	1	-2/+4
* \|	Merge pull request #6938 from acapilleri/as_json_refactoring	Carlos Antonio da Silva	2012-07-07	1	-2/+6
\|\ \
\| * \|	small refactoring of as_json method	Angelo Capilleri	2012-07-03	1	-2/+6
\| \|/
* /	observer update refactoring	Angelo Capilleri	2012-07-03	1	-2/+1
\|/
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-06-30	6	-118/+357
\|\
\| *	update ActiveModel::Name documentation [ci skip]	Francesco Rodriguez	2012-06-25	1	-1/+133
\| *	fix punctuation in activemodel/errors [ci skip]	Francesco Rodriguez	2012-06-25	1	-1/+1
\| *	update ActiveModel::Naming documentation	Francesco Rodriguez	2012-06-23	1	-7/+8
\| *	update ActiveModel::Model documentation [ci skip]	Francesco Rodriguez	2012-06-23	1	-16/+37
\| *	add description ActiveModel::StrictValidationField [ci skip]	Francesco Rodriguez	2012-06-23	1	-0/+10
\| *	update ActiveModel::Lint documentation [ci skip]	Francesco Rodriguez	2012-06-22	1	-22/+23
\| *	update ActiveModel::Errors#include? documentation [ci skip]	Francesco Rodriguez	2012-06-22	1	-1/+1
\| *	add documentation and examples to ActiveModel::Errors [ci skip]	Francesco Rodriguez	2012-06-22	1	-4/+26
\| *	update ActiveModel::Errors documentation and minor fixes [ci skip]	Francesco Rodriguez	2012-06-22	3	-64/+103
\| *	update ActiveModel::Conversion documentation [ci skip]	Francesco Rodriguez	2012-06-22	1	-8/+21
* \|	Refactor attribute method matcher to use Hash#fetch	Carlos Antonio da Silva	2012-06-26	1	-5/+3
* \|	Cleanup attribute methods a bit, use map! when accepting *args	Carlos Antonio da Silva	2012-06-26	1	-17/+12
* \|	Use default + merge! instead of reverse_merge	Carlos Antonio da Silva	2012-06-26	1	-1/+1
* \|	Set hash value instead of merge a single key, and use flatten! if possible	Carlos Antonio da Silva	2012-06-26	2	-4/+5
* \|	add :nodoc: to internal implementations [ci skip]	Francesco Rodriguez	2012-06-25	10	-19/+19
* \|	Make internal callback model definitions private in AMo	Carlos Antonio da Silva	2012-06-25	1	-5/+7
* \|	add :nodoc: to internal implementations [ci skip]	Francesco Rodriguez	2012-06-22	4	-4/+4
* \|	change param name to improve documentation	Francesco Rodriguez	2012-06-22	1	-2/+2
\|/
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-06-22	3	-61/+133
\|\
\| *	fixes a few mistakes in api docs [ci skip]	Vijay Dev	2012-06-22	2	-2/+2
\| *	update ActiveModel::Callbacks documentation [ci skip]	Francesco Rodriguez	2012-06-22	1	-24/+26
\| *	add description to ActiveModel::MissingAttributeError [ci skip]	Francesco Rodriguez	2012-06-21	1	-1/+2
\| *	add example to ActiveModel::AttributeMethods#undefine_attribute_methods [ci s...	Francesco Rodriguez	2012-06-21	1	-0/+26
\| *	add docs to AM::AttributeMethods#define_attribute_method [ci skip]	Francesco Rodriguez	2012-06-21	1	-0/+25
\| *	fix ActiveModel::AttributeMethods#alias_attribute documentation [ci skip]	Francesco Rodriguez	2012-06-21	1	-7/+20
\| *	update ActiveModel::AttributeMethods documentation [ci skip]	Francesco Rodriguez	2012-06-21	1	-27/+20
\| *	add example to ActiveModel::Validations#validators [ci skip]	Francesco Rodriguez	2012-06-15	2	-3/+15
* \|	Merge pull request #6800 from mschneider/dynamic_finders_for_aliased_attributes	Rafael Mendonça França	2012-06-22	2	-1/+12
\|\ \
\| * \|	made dynamic finders alias_attribute aware	Maximilian Schneider	2012-06-22	2	-1/+12
* \| \|	Add some coverage for AR serialization with serializable_hash	Carlos Antonio da Silva	2012-06-22	1	-1/+1
* \| \|	add :nodoc: to AM::AttributeMethods#instance_method_already_implemented? [ci ...	Francesco Rodriguez	2012-06-21	1	-1/+1
* \| \|	add :nodoc: to AM::AttributeMethods::AttributeMethodMatcher [ci skip]	Francesco Rodriguez	2012-06-21	1	-1/+1
\|/ /
* /	Simplify AR configuration code.	Jon Leighton	2012-06-15	7	-302/+8
\|/
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-06-14	3	-10/+13
\|\
\| *	Range#cover? is not implemented in AS now	Akira Matsuda	2012-06-12	2	-4/+3
\| *	Make observer enable/disable documentation more informative.	Robb Kidd	2012-06-09	1	-6/+10
* \|	prevent users from unknowingly using bad regexps that can compromise security...	MrBrdo	2012-06-14	4	-9/+41
* \|	Merge pull request #6668 from pomnikita/master	Piotr Sarnacki	2012-06-08	2	-1/+7
\|\ \
\| * \|	Compact array of values added to PermissionSet instance	Nikita Pomyashchiy	2012-06-08	2	-1/+7
\| \|/