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-11-17	1	-17/+19
\|\ \| \| \| \| \| \| \| \|	Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb
\| *	Remove unecessary word	Agis Anastasopoulos	2012-11-15	1	-1/+1
\| \|
\| *	Slightly improve the syntax & grammar	Agis Anastasopoulos	2012-11-15	1	-3/+3
\| \|
\| *	Add a note for the example in Setting Custom Headers	Agis Anastasopoulos	2012-11-15	1	-0/+2
\| \|
\| *	Wrap before & after words in quotes when they're referring to filters	Agis Anastasopoulos	2012-11-15	1	-6/+6
\| \| \| \| \| \|	Using these words without quotes (example sentence: Before filters are run) can be confusing to a newcomer.
\| *	Slightly improve the syntax	Agis Anastasopoulos	2012-11-15	1	-1/+1
\| \|
\| *	Replace "name" with "author" in the Cookies example	Agis Anastasopoulos	2012-11-15	1	-2/+2
\| \| \| \| \| \|	I think doing `@comments.name` is a little confusing, just doesn't sounds right.
\| *	Minor punctuation improvement in ActionController guide	Agis Anastasopoulos	2012-11-15	1	-1/+1
\| \|
\| *	Use the more compact syntax in the example	Agis Anastasopoulos	2012-11-15	1	-1/+1
\| \|
\| *	use em-dashes instead of two minuses in guides	burningTyger	2012-11-10	1	-2/+2
\| \|
* \|	Rename secret_token_key to secret_key_base	Santiago Pastorino	2012-11-03	1	-1/+1
\| \|
* \|	Sign cookies using key deriver	Santiago Pastorino	2012-11-03	1	-1/+1
\|/
*	Use a better word	Agis Anastasopoulos	2012-10-26	1	-1/+1
\|
*	Revert "divided into folder with the language"	Rafael Mendonça França	2012-10-17	1	-0/+845
\| \| \| \| \| \|	This reverts commit f5b9ed4fbc3215a5fce48985ea372ad3f1182252. REASON: Translation work can not be done in the docrails repository
*	divided into folder with the language	Rodrigo Martins	2012-10-17	1	-845/+0
\|
*	[Guides] Format content for small devices	Joe Fiorini	2012-10-06	1	-2/+2
\|
*	Update examples in action_controller_overview.md to ruby 1.9 syntax. [ci skip]	José Corcuera	2012-09-21	1	-4/+4
\|
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-09-21	1	-33/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes.
*	Fix remaining formatting problems in the guide	Prem Sichanugrist	2012-09-17	1	-5/+5
\|
*	Convert all tables to Markdown syntax	Prem Sichanugrist	2012-09-17	1	-19/+21
\|
*	Convert all the links into Markdown format	Prem Sichanugrist	2012-09-17	1	-10/+10
\|
*	Convert all inline codes to Markdown syntax	Prem Sichanugrist	2012-09-17	1	-74/+74
\|
*	change shell to bash	Prem Sichanugrist	2012-09-17	1	-1/+1
\|
*	Convert inline code tags to Markdown	Prem Sichanugrist	2012-09-17	1	-5/+5
\|
*	Convert heading tags and heading section	Prem Sichanugrist	2012-09-17	1	-35/+50
\|
*	Convert code blocks into GFM style	Prem Sichanugrist	2012-09-17	1	-90/+90
\|
*	Rename the rest of the guides to Markdown	Prem Sichanugrist	2012-09-17	1	-0/+833