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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #5966 from oscardelben/fix_secure_password_setter	José Valim	2012-04-24	2	-1/+7
\|\ \| \| \| \|	Fix secure_password setter
\| *	Fix secure_password setter	Oscar Del Ben	2012-04-24	2	-1/+7
\| \|
* \|	Merge pull request #5929 from FLOChip/notes	Jeremy Kemper	2012-04-24	2	-4/+14
\|\ \ \| \| \| \| \| \|	`rake notes` and `rake notes:custom` now support css, scss, and css.
\| * \|	`rake notes` and `rake notes:custom` now support	Teng Siong Ong	2012-04-22	2	-4/+14
\| \| \| \| \| \| \| \| \|	css, scss and css.
* \| \|	Merge pull request #5965 from oscardelben/refactor_secure_password_authenticate	José Valim	2012-04-24	1	-5/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Refactor SecurePassword#authenticate
\| * \| \|	Refactor SecurePassword#authenticate	Oscar Del Ben	2012-04-24	1	-5/+1
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #5963 from kennyj/fix_build_20120425	Jeremy Kemper	2012-04-24	2	-3/+9
\|\ \ \ \| \|/ / \|/\| \|	Fix build. It seems that the Mocha's behavior was changed.
\| * \|	Fix build. It seems that the Mocha's behavior were changed.	kennyj	2012-04-25	2	-3/+9
\|/ /
* \|	Merge pull request #5961 from bogdan/routes	Jeremy Kemper	2012-04-24	1	-20/+26
\|\ \ \| \| \| \| \| \|	Refactor ActionDispatch::HTTP::Url#url_for
\| * \|	ActionDispatch::HTTP::Url#url_for refactor method	Bogdan Gusiev	2012-04-24	1	-20/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Separated right side url generation(before query string) from left side url generation(after query string)
* \| \|	Merge pull request #5927 from avakhov/distance_of_time_in_words-swap	Jeremy Kemper	2012-04-24	2	-16/+41
\|\ \ \ \| \| \| \| \| \| \| \|	Distance of time in words should work correctly if from_time > to_time
\| * \| \|	Use leap years trick in distance_of_time_in_words only for distances between ↵	Alexey Vakhov	2012-04-24	2	-12/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	real date points
\| * \| \|	fixed non matching documentation behaviour with method semantics on ↵	Marcelo Casiraghi	2012-04-24	2	-3/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	distance_of_time_in_words
\| * \| \|	Distance of time in words should work correct if from time > to_time	Alexey Vakhov	2012-04-24	2	-2/+4
\| \| \| \|
* \| \| \|	Merge pull request #5956 from arunagw/mocha_upgrade	Jeremy Kemper	2012-04-24	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Upgrading to Mocha 0.11.2 to fix Object#method override
\| * \| \| \|	Upgrading mocha 0.11.2	Arun Agrawal	2012-04-24	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #5960 from homakov/patch-3	José Valim	2012-04-24	1	-5/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Delete insecure and "bad practice" code.
\| * \| \| \| \|	Deleting insecure and "bad practice" code. related: ↵	Egor Homakov	2012-04-24	1	-5/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	http://homakov.blogspot.com/2012/04/whitelist-your-routes-match-is-evil.html
* \| \| \| \|	Merge pull request #5959 from carlosantoniodasilva/refactor-route_set	Aaron Patterson	2012-04-24	1	-3/+4
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Refactor hash creation in routeset
\| * \| \| \|	Refactor hash creation in routeset	Carlos Antonio da Silva	2012-04-24	1	-3/+4
\|/ / / /
* \| \| \|	Merge pull request #5957 from bogdan/routes	José Valim	2012-04-24	1	-26/+20
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	RouteSet: decomplecting a way to handle positional args
\| * \| \|	RouteSet: decomplecting a way to handle positional args	Bogdan Gusiev	2012-04-24	1	-26/+20
\|/ / /
* \| \|	Merge pull request #5955 from bogdan/routes	José Valim	2012-04-24	1	-13/+21
\|\ \ \ \| \| \| \| \| \| \| \|	RouteSet: simplify routes helpers generation code
\| * \| \|	RouteSet: simplify routes helpers generation code	Bogdan Gusiev	2012-04-24	1	-13/+21
\|/ / /
* \| \|	Merge pull request #5954 from bogdan/routes	José Valim	2012-04-24	2	-0/+3
\|\ \ \ \| \|/ / \|/\| \|	Add missing requires in routes
\| * \|	Add missing requires in routes	Bogdan Gusiev	2012-04-23	2	-0/+3
\| \| \|
* \| \|	Only include Rake::DSL if it's defined.	Joe Van Dyk	2012-04-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	rake < 0.9 doesn't define Rake::DSL.
* \| \|	Merge pull request #5887 from mcrowe/document-relation-merge	Vijay Dev	2012-04-23	1	-0/+14
\|\ \ \ \| \|/ / \|/\| \|	Add documentation to the SpawnMethods#merge method.
\| * \|	Add documentation to the SpawnMethods#merge method.	Mitch Crowe	2012-04-17	1	-0/+14
\| \| \|
* \| \|	Merge pull request #5930 from carlosantoniodasilva/generated-attribute-refactor	José Valim	2012-04-22	1	-7/+10
\|\ \ \ \| \|_\|/ \|/\| \|	Refactor GeneratedAttributes
\| * \|	Refactor GeneratedAttributes	Carlos Antonio da Silva	2012-04-22	1	-7/+10
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Move reference? method to class to remove duplicated code * Move to_sym typecast from #initialize to .parse method (make it easier to refactor reference?), remove AS object/blank require * Use []= instead of merge!({}) * Remove in? in favor of include?, remove AS object/inclusion require
* \|	Merge pull request #5917 from oscardelben/master	Piotr Sarnacki	2012-04-21	1	-1/+0
\|\ \ \| \| \| \| \| \|	Remove circular require warning
\| * \|	Remove circular require of time/zones	Oscar Del Ben	2012-04-21	1	-1/+0
\| \| \|
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-21	39	-314/+391
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Revert "in feedback solicitation text, correct that docrails is fork, not ↵	Vijay Dev	2012-04-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	branch" This reverts commit 7b7cc1341bd41106c0e6c5eb399f8aff39b43f52. Reason: docrails isn't a rails fork. See 5444ed56ab38a742b3ddf6612eadd8cf50d8d517 [ci skip]
\| * \|	Merge branch 'master' of github.com:lifo/docrails	Oscar Del Ben	2012-04-21	2	-2/+2
\| \|\ \
\| \| * \|	Comma missed	Alexey Vakhov	2012-04-21	1	-1/+1
\| \| \| \|
\| \| * \|	in feedback solicitation text, correct that docrails is fork, not branch	Rory O’Kane	2012-04-20	1	-1/+1
\| \| \| \|
\| * \| \|	Add validation code to getting started guide and improve validation	Oscar Del Ben	2012-04-21	4	-10/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	section
\| * \| \|	Add model validation section to Getting Started guide	Oscar Del Ben	2012-04-21	11	-96/+93
\| \|/ /
\| * \|	Merge branch 'master' of github.com:lifo/docrails	Oscar Del Ben	2012-04-20	2	-2/+2
\| \|\ \
\| \| * \|	Fix example in ActionView::Helpers::FormHelper	Thibaut Courouble	2012-04-20	1	-1/+1
\| \| \| \|
\| \| * \|	removed extra "you"	Kevin Musiorski	2012-04-19	1	-1/+1
\| \| \| \|
\| * \| \|	Add index and links section to Getting started guide	Oscar Del Ben	2012-04-20	11	-24/+123
\| \| \| \|
\| * \| \|	Add show action in getting started guide	Oscar Del Ben	2012-04-20	6	-27/+63
\| \| \| \|
\| * \| \|	New Getting started guide wont have tags	Oscar Del Ben	2012-04-20	6	-36/+1
\| \| \| \|
\| * \| \|	Adapt "Getting started guide" code sample	Oscar Del Ben	2012-04-20	8	-129/+36
\| \| \| \|
\| * \| \|	Add "Saving data in the controller" section	Oscar Del Ben	2012-04-20	1	-0/+27
\| \|/ /
\| * \|	Add model creation step to getting started guide	Oscar Del Ben	2012-04-19	1	-6/+27
\| \| \|
\| * \|	Fix broken images links	Oscar Del Ben	2012-04-19	1	-5/+4
\| \| \|