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

	Commit message (Expand)	Author	Age	Files	Lines
*	much code can be deleted thanks to @tenderlove's refactoring	Jon Leighton	2012-03-28	3	-72/+6
*	Merge pull request #5630 from andhapp/fix-config-asset-manifest	Santiago Pastorino	2012-03-28	1	-1/+1
\|\
\| *	Changed the config.assets.manifest to nil in the comments in the production c...	Anuj Dutta	2012-03-28	1	-1/+1
* \|	Add test for default_url_options[:port]	Aaron Suggs	2012-03-28	1	-0/+12
* \|	Merge pull request #2528 from cesario/fix_2507	José Valim	2012-03-28	3	-5/+15
\|\ \
\| * \|	Rails.initialized? can be called at any time without raising an exception [Cl...	Franck Verrot	2012-03-28	3	-5/+15
* \| \|	Merge pull request #5623 from Houdini/master	José Valim	2012-03-28	1	-2/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	remove redundant variable	Dmitrii Golub	2012-03-28	1	-2/+1
\| \|/
* \|	Merge pull request #5616 from cbartlett/migration-indent	Santiago Pastorino	2012-03-27	1	-2/+2
\|\ \
\| * \|	Fix indenting in migration generator	Colin Bartlett	2012-03-27	1	-2/+2
* \| \|	Merge pull request #5621 from rafaelfranca/fix-2492-master	Jeremy Kemper	2012-03-27	2	-3/+37
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Check if the options hash already exists and merge it with the another	Rafael Mendonça França	2012-03-27	3	-18/+23
\| * \|	Fixing issue #2492 for master branch. ActionView::Base.field_error_proc doesn...	Andrey Samsonov	2012-03-27	2	-2/+31
* \| \|	Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-master	Santiago Pastorino	2012-03-27	3	-8/+12
\|\ \ \
\| * \| \|	Don't break Haml with textarea newline fix.	James Coleman	2012-03-27	3	-8/+12
* \| \| \|	Remove Arel::Relation constant from PredicateBuilder.	Juanjo Bazán	2012-03-27	1	-2/+2
* \| \| \|	adds delegetion for eof? to AD::Http::UploadedFile	Jens Fahnenbruck	2012-03-27	2	-1/+7
\|/ / /
* \| \|	attributes are cached by string keys, so to_s to support symbols. fixes #5549	Aaron Patterson	2012-03-27	3	-2/+17
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-03-27	8	-6/+69
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	minor edits in testing guide [ci skip]	Vijay Dev	2012-03-27	1	-4/+2
\| * \|	add missing do [ci skip]	Vijay Dev	2012-03-27	1	-1/+1
\| * \|	Revert "[ci skip] updated bin/rails code in Rails Initialization Process guide"	Vijay Dev	2012-03-27	1	-16/+6
\| * \|	Proc objects for caches_page no need controller object	Alexey Vakhov	2012-03-27	1	-1/+1
\| * \|	added shallow_prefix option description in documantation	Lukasz Sarnacki	2012-03-27	1	-0/+19
\| * \|	Missing generated query for pluck method.	Juanjo Bazán	2012-03-27	1	-1/+1
\| * \|	Made it a bit more clear where to run rails/server	Dimitri De Frenne	2012-03-26	1	-1/+1
\| * \|	Fixed typo in path	Dimitri De Frenne	2012-03-26	1	-1/+1
\| * \|	document `-e` argument for rails console	schneems	2012-03-24	1	-0/+6
\| * \|	Testing layout gotcha when view renders partial	Panayotis Matsinopoulos	2012-03-24	1	-0/+16
\| * \|	Small layout correction	Panayotis Matsinopoulos	2012-03-24	1	-2/+1
\| * \|	Testing Template and Layout Example	Panayotis Matsinopoulos	2012-03-24	1	-0/+25
\| * \|	Use one 'be'.	Waseem Ahmad	2012-03-24	1	-1/+1
\| * \|	Fix AC actions caching comment	Alexey Vakhov	2012-03-24	1	-1/+1
\| * \|	[ci skip] updated bin/rails code in Rails Initialization Process guide	Senthil A	2012-03-24	1	-6/+16
* \| \|	Merge pull request #5499 from arunagw/remove_unused_code	Santiago Pastorino	2012-03-27	1	-2/+2
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	removed unused variables	Arun Agrawal	2012-03-27	1	-2/+2
* \| \|	If partial is rendered in controller, grab format from template	Piotr Sarnacki	2012-03-27	3	-2/+22
* \| \|	Merge pull request #5609 from tjmcewan/master	José Valim	2012-03-27	2	-0/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	change number_with_precision to not return negative zeros	Tim McEwan	2012-03-27	2	-0/+2
\|/ /
* \|	Merge pull request #5582 from chendo/master	Xavier Noria	2012-03-26	1	-1/+1
\|\ \
\| * \|	Remove 'needless boolean casting'.	Jack Chen (chendo)	2012-03-26	1	-1/+1
* \| \|	favor composition over inheritance	Aaron Patterson	2012-03-26	1	-5/+20
* \| \|	Don't ignore non Enumerable values passed to sanitize (closes #5585)	Piotr Sarnacki	2012-03-27	2	-0/+29
* \| \|	favor composition over inheritance	Aaron Patterson	2012-03-26	2	-8/+30
* \| \|	Merge pull request #2621 from icco/master	Aaron Patterson	2012-03-26	1	-1/+1
\|\ \ \
\| * \| \|	Not checking for nil is apparently a lot faster.	Nat Welch	2011-09-21	1	-1/+1
\| * \| \|	Merge branch 'master' of git://github.com/rails/rails	Nat Welch	2011-09-21	349	-3121/+6229
\| \|\ \ \
\| * \| \| \|	From @dasch's recommendation.	Nat Welch	2011-08-22	1	-1/+1
\| * \| \| \|	Fixes bug with schema dumper when using with Padrino.	Nat Welch	2011-08-21	1	-1/+1
* \| \| \| \|	Merge pull request #5601 from carlosantoniodasilva/cookie-store-session-hash	Aaron Patterson	2012-03-26	2	-2/+3
\|\ \ \ \ \