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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-25	20	-44/+242
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	copy edits [ci skip]	Vijay Dev	2012-04-25	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Revert "Added warning that require_tree includes files in unspecified order. ↵	Vijay Dev	2012-04-25	1	-7/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So, that people may know the order of their scripts might be the reason that their scripts work in just fine in development but not in production. " This reverts commit 9dbd511172170f60b96012b7b87044638c3962b8. Reason: Sounds like something for the guide, not the template.
\| * \| \| \| \| \| \|	removing changes made in ccd0b511c933d3e2c7f3e345622ad2cc17728de5 and ↵	Vijay Dev	2012-04-25	1	-2/+0
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	189a1728b561c19404f814979fd73adc5bea554d [ci skip]
\| * \| \| \| \| \|	Add partials explanation to getting started guide	Oscar Del Ben	2012-04-25	1	-0/+31
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add screenshot to updating post section	Oscar Del Ben	2012-04-25	2	-1/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix code syntax	Oscar Del Ben	2012-04-25	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add include documentation to serialization	Oscar Del Ben	2012-04-25	1	-1/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	improve serialization doc	Oscar Del Ben	2012-04-25	1	-4/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove lonely number sign	Alexey Vakhov	2012-04-25	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	for get -> forget	Uģis Ozols	2012-04-25	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added notice on how to enable gzip compression.	Gaurish Sharma	2012-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(Fixed typo from previous commit: ccd0b511c933d3e2c7f3e345622ad2cc17728de5)
\| * \| \| \| \| \|	Added notice on how to enable gzip compression in rails app using ↵	Gaurish Sharma	2012-04-25	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rack::Deflater. it is disabled & commented out by default.
\| * \| \| \| \| \|	Remove references to 'vendored plugins' except to note they used to exist ↵	Jonathan Rochkind	2012-04-24	1	-6/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	but are deprecated. 'gemified plugin' is the only supported option now.
\| * \| \| \| \| \|	Added warning that require_tree includes files in unspecified order. So, ↵	Gaurish Sharma	2012-04-25	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	that people may know the order of their scripts might be the reason that their scripts work in just fine in development but not in production.
\| * \| \| \| \| \|	Added some useful methods to the generators.textile	James Strocel	2012-04-24	1	-0/+21
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Correct documentation of SecurePassword	Oscar Del Ben	2012-04-24	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	make sample code more compact	Oscar Del Ben	2012-04-24	1	-13/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add update post section to getting started guide	Oscar Del Ben	2012-04-24	7	-4/+152
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix some code in getting started guide	Oscar Del Ben	2012-04-24	2	-9/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Missed checked in Form Helper example	Alexey Vakhov	2012-04-24	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix markdown in textile.	Dmytrii Nagirniak	2012-04-23	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make it explicit that Symbol-s are not officially supported.	Dmytrii Nagirniak	2012-04-23	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will remove a lot of controversy. As an example, see https://github.com/ernie/squeel/issues/67#issuecomment-5270896
\| * \| \| \| \| \|	Merge pull request #92 from geetarista/add-favicon	Vijay Dev	2012-04-22	2	-0/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds favicon to guides layout
\| \| * \| \| \| \| \|	Adds favicon to guides layout	Robby Colvin	2012-04-22	2	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add distance_of_time_in_words example for seconds	Alexey Vakhov	2012-04-22	1	-0/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed expected value in comment. Removed duplicate lines in example.	Bernard Kroes	2012-04-21	1	-4/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5980 from gazay/valid_ips	Jeremy Kemper	2012-04-25	2	-42/+182
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remote ip logic and validation. IPv6 support.
\| * \| \| \| \| \| \| \|	Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and ↵	Alexey Gaziev	2012-04-25	2	-42/+182
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tests.
* \| \| \| \| \| \| \| \|	Merge pull request #5976 from aderyabin/fix1	Jeremy Kemper	2012-04-25	1	-5/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Duplicate quote_table_name method
\| * \| \| \| \| \| \| \| \|	already defined in quoting	Andrey Deryabin	2012-04-25	1	-5/+0
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5978 from aderyabin/fix2	Jeremy Kemper	2012-04-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cleanliness in method parameters
\| * \| \| \| \| \| \| \| \|	cleanliness in method parameters	Andrey Deryabin	2012-04-25	1	-1/+1
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5880 from asanghi/master	Jeremy Kemper	2012-04-25	9	-35/+32
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stamp out ruby-debug with debugger everywhere else in the code base
\| * \| \| \| \| \| \| \| \|	and one more time	Aditya Sanghi	2012-04-24	7	-24/+17
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	another attempt at the language	Aditya Sanghi	2012-04-18	6	-14/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	review changes for #5875	Aditya Sanghi	2012-04-18	3	-6/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	stamp out ruby-debug19 with extreme prejudice :)	Aditya Sanghi	2012-04-17	9	-30/+34
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #5977 from oscardelben/refactor_serializable_hash	José Valim	2012-04-25	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor refactor of serializable hash
\| * \| \| \| \| \| \| \| \| \|	Minor refactor of serializable hash	Oscar Del Ben	2012-04-25	1	-2/+1
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* / \| \| \| \| \| \| \| \|	Remove unnecessary empty line	José Valim	2012-04-25	1	-1/+0
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5841 from oscardelben/rename_count_observers	José Valim	2012-04-24	2	-2/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename Observing#count_observers to Observing#observers_count
\| * \| \| \| \| \| \| \| \|	Rename Observing#count_observers to Observing#observers_count	Oscar Del Ben	2012-04-14	2	-2/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Clean up some straggling build failures	Jose and Yehuda	2012-04-24	3	-10/+10
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Remove default match without specified method	Jose and Yehuda	2012-04-24	57	-455/+463
\| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the current router DSL, using the +match+ DSL method will match all verbs for the path to the specified endpoint. In the vast majority of cases, people are currently using +match+ when they actually mean +get+. This introduces security implications. This commit disallows calling +match+ without an HTTP verb constraint by default. To explicitly match all verbs, this commit also adds a :via => :all option to +match+. Closes #5964
* \| \| \| \| \| \| \| \|	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