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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #2836 from avakhov/action-controller-helpers-desc	Vijay Dev	2011-09-03	1	-3/+6
\|\
\| *	fix helpers behavior description	Alexey Vakhov	2011-09-03	1	-3/+6
* \|	Merge pull request #2825 from guilleiguaran/bcrypt-ruby-comments	Aaron Patterson	2011-09-03	2	-0/+9
\|\ \
\| * \|	Add comments about bcrypt-ruby gem to SecurePassword	Guillermo Iguaran	2011-09-03	1	-0/+6
\| * \|	Add bcrypt-ruby to Gemfile template	Guillermo Iguaran	2011-09-03	1	-0/+3
* \| \|	Merge pull request #2824 from arunagw/bcrypt_fix	Aaron Patterson	2011-09-03	1	-0/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Need to add here to pass the test	Arun Agrawal	2011-09-03	1	-0/+1
\| \|/
* \|	Merge pull request #2827 from sikachu/extractable_ordered_hash	José Valim	2011-09-03	3	-0/+12
\|\ \ \| \|/ \|/\|
\| *	Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_optio...	Prem Sichanugrist	2011-09-03	3	-0/+12
* \|	fixes CSS example in the asset pipeline guide	Xavier Noria	2011-09-03	1	-1/+1
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-09-02	12	-83/+174
\|\ \
\| * \|	Revert "Fixing guides validation errors."	Vijay Dev	2011-09-02	10	-24/+18
\| * \|	debug option to js, stylesheet tags are ignored when debug mode is off	Vijay Dev	2011-09-02	1	-1/+1
\| * \|	Merge branch 'fix_validation_errors'	Andrew Olson	2011-09-02	10	-17/+23
\| \|\ \
\| \| * \|	Fixing guides validation errors.	Andrew Olson	2011-09-02	10	-18/+24
\| * \| \|	When a collection is empty, render returns nil.	Matt Burke	2011-09-02	1	-0/+7
\| * \| \|	Merge branch 'activemodel_typo_fix'	Josh Nesbitt	2011-09-02	1	-1/+1
\| \|\ \ \
\| \| * \| \|	Fix typo in ActiveModel::Dirty comment. define_attribute_methods is a class m...	Josh Nesbitt	2011-09-02	1	-1/+1
\| \|/ / /
\| * \| \|	Change the styling of '<ruby>initialize</ruby>' to '+initialize+' (the former...	Stephen J. Butler	2011-09-01	1	-1/+1
\| * \| \|	fix some minor omissions in pipeline docs	Richard Hulse	2011-09-02	1	-5/+18
\| * \| \|	Add #update_attributes as another alternative to #update_column.	Sebastian Martinez	2011-09-01	1	-1/+1
\| * \| \|	Merge pull request #63 from carlosparamio/master	Vijay Dev	2011-09-01	1	-6/+6
\| \|\ \ \
\| \| * \| \|	Fix name of parent resource params when declaring nested resources at routes	Carlos Paramio	2011-09-01	1	-6/+6
\| \|/ / /
\| * \| \|	Revert "Fix logic in 3.1 release notes sentence"	Vijay Dev	2011-09-01	1	-1/+1
\| * \| \|	Modified ActionMailer Basics doc with the following change:	Andy Leeper	2011-09-01	1	-2/+3
\| * \| \|	Merge pull request #62 from roytomeij/master	Vijay Dev	2011-09-01	1	-5/+5
\| \|\ \ \
\| \| * \| \|	Change "SCSS" to "Sass" in sentences where it's referred to as "language", be...	Roy Tomeij	2011-09-01	1	-5/+5
\| \|/ / /
\| * / /	docs formatting changes	Vijay Dev	2011-09-01	3	-4/+4
\| \|/ /
\| * \|	Move css data URI into css/erb section	Richard Hulse	2011-09-01	1	-8/+8
\| * \|	pipeline docs improvement	Richard Hulse	2011-09-01	1	-20/+25
\| * \|	pipeline docs - spelling and some whitespace	Richard Hulse	2011-09-01	1	-5/+5
\| * \|	Adding reference about ExecJS for CoffeeScript	Guillermo Iguaran	2011-09-01	1	-2/+4
\| * \|	Add reference to ExecJS in JavaScript Compression section	Guillermo Iguaran	2011-09-01	1	-1/+3
\| * \|	Fixing sass-rails helpers methods examples	Guillermo Iguaran	2011-09-01	1	-4/+4
\| * \|	Giving info about what are the defaults for test environment	Guillermo Iguaran	2011-09-01	1	-1/+1
\| * \|	update pipeline docs to reflect new defaults	Richard Hulse	2011-09-01	1	-32/+93
\| * \|	Review config.assets options.	Guillermo Iguaran	2011-08-31	1	-1/+1
\| * \|	Merge pull request #61 from gabebw/master	Xavier Noria	2011-08-31	2	-2/+2
\| \|\ \
\| \| * \|	Improve examples: use each instead of for...in	Gabe Berke-Williams	2011-08-31	2	-2/+2
\| \|/ /
* \| /	Remove hard dependency on bcrypt.	Guillermo Iguaran	2011-09-02	3	-3/+4
\| \|/ \|/\|
* \|	Merge pull request #2811 from avakhov/fix-environment-generator-action	José Valim	2011-09-02	2	-2/+2
\|\ \
\| * \|	fix indent for generator environment method	Alexey Vakhov	2011-09-02	2	-2/+2
\|/ /
* \|	* Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731	Aaron Patterson	2011-09-01	3	-2/+27
* \|	make sure encoding_aware? is available	Aaron Patterson	2011-09-01	1	-0/+2
* \|	CookieJar is enumerable. fixes #2795	Aaron Patterson	2011-09-01	3	-0/+23
* \|	Merge pull request #2775 from jaw6/fix/reverse	Aaron Patterson	2011-09-01	2	-4/+7
\|\ \
\| * \|	Fixes bug in ActiveRecord::QueryMethods, #1697	Joshua Wehner	2011-08-31	2	-4/+7
* \| \|	Merge pull request #2718 from dasch/patch-5	Vijay Dev	2011-09-01	1	-1/+4
\|\ \ \
\| * \| \|	Split long string into multiple shorter ones	Daniel Schierbeck	2011-08-29	1	-1/+4
* \| \| \|	Merge pull request #2585 from marcgg/fix-ruby19-splitoptions	José Valim	2011-09-01	2	-1/+20
\|\ \ \ \