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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \|	Add a missing require for 'active_support/deprecation' in Module#deprecate	Esad Hajdarevic	2011-09-20	1	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5747 from mneisen/patch-1	Xavier Noria	2012-04-05	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|	Optimistic locking: lock_version needed type information.
\| * \| \| \| \| \|	Optimistic locking: lock_version needed type information.	Martin Eisenhardt	2012-04-05	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5716 from jurriaan/tr-gsub-cleanup	Santiago Pastorino	2012-04-04	17	-20/+20
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated/changed unneeded tr/gsubs
\| * \| \| \| \| \|	Updated/changed useless tr/gsubs	Jurriaan Pruis	2012-04-03	17	-20/+20
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5188 from jlxw/patch-1	Santiago Pastorino	2012-04-04	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	logger.silence is deprecated
\| * \| \| \| \| \| \|	logger.silence is deprecated	jlxw	2012-02-27	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5733 from oscardelben/patch-5	Santiago Pastorino	2012-04-04	1	-2/+0
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|	No need to extend ActiveSupport::Extend here
\| * \| \| \| \| \| \|	No need to extend ActiveSupport::Extend here	Oscar Del Ben	2012-04-04	1	-2/+0
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-04	8	-25/+83
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: guides/source/engines.textile
\| * \| \| \| \| \| \|	Revert "rails 4 will support ruby version 1.9.4 or higher"	Vijay Dev	2012-04-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 0a35acb8b89603a3135852742f206af82ed61b57. Reason: Let's cross the bridge when we reach there.
\| * \| \| \| \| \| \|	Fix AC responder example	Alexey Vakhov	2012-04-04	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	typo mistake fixed	Sandip Ransing	2012-04-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	correction to server stop statement added
\| * \| \| \| \| \| \|	rails 4 will support ruby version 1.9.4 or higher	Sandip Ransing	2012-04-04	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed small typo	Fernando Briano	2012-04-03	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	also <text> replaced by <plain>	Mikhail Dieterle	2012-04-04	1	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Changed engines guide not to use a css tag. <plain> will do just fine.	Mikhail Dieterle	2012-04-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/lifo/docrails/commit/bb23d6fb005edaf25f5b294f9215429fb44b3f3d
\| * \| \| \| \| \| \|	Remove non-obligatory params in AC respond_to examples	Alexey Vakhov	2012-04-03	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove unnecessary articles.	Waseem Ahmad	2012-04-03	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Hrvoje Šimić	2012-04-02	2	-2/+2
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Revert "parse <css> block as code (used in engines guide) "	Vijay Dev	2012-04-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c46374a9d949004761d71570a4d703838c694e74. Reason: Changed engines guide not to use a css tag. <plain> will do just fine.
\| \| * \| \| \| \| \| \|	wrong link to getting started guide	Mikhail Dieterle	2012-04-03	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	update purpose of middleware	Hrvoje Šimić	2012-04-02	1	-11/+66
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	update to current rack middleware stack	Hrvoje Šimić	2012-04-02	1	-3/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	parse <css> block as code (used in engines guide)	Mikhail Dieterle	2012-04-02	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Correct invalid route example [ci skip]	Cezary Baginski	2012-04-02	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	the file update checker now also detects removed files	Xavier Noria	2012-04-03	2	-26/+40
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	DATABASE_URL allows omission of database.yml	Tim Pope	2012-04-03	1	-1/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	use File.binread to pull in the schema cache	Aaron Patterson	2012-04-03	2	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5723 from tiegz/minor_fixes	José Valim	2012-04-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|	minor elsif/else typo fix
\| * \| \| \| \| \| \|	minor elsif/else typo fix	Tieg Zaharia	2012-04-03	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #5713 from bolshakov/master	Xavier Noria	2012-04-03	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in "dasherize" description
\| * \| \| \| \| \| \|	Fix typo	Artyom Bolshakov	2012-04-03	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5708 from romanvbabenko/refactor/add_gem_filters	Aaron Patterson	2012-04-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|	Unnecessary uniqueness & force mapping has been removed at BacktraceClea...
\| * \| \| \| \| \| \|	Unnecessary uniqueness & force mapping has been removed at ↵	Roman V. Babenko	2012-04-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BacktraceCleaner#add_gem_filters
* \| \| \| \| \| \| \|	Merge pull request #5695 from lest/patch-1	Piotr Sarnacki	2012-04-02	2	-1/+35
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add type option to atom feed entry builder
\| * \| \| \| \| \| \| \|	add type option to atom feed entry builder	Sergey Nartimov	2012-04-01	2	-1/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes #5672
* \| \| \| \| \| \| \| \|	fix formatting in engines guide; also removed a couple of non-existent ↵	Vijay Dev	2012-04-02	1	-35/+25
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	images [ci skip]
* \| \| \| \| \| \| \|	Usage file in generators shouldn't be fetched only based on source_root	Piotr Sarnacki	2012-04-01	3	-5/+22
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In case `source_roout` is not set, `default_source_root` is used, which includes also `templates` directory. If there is no `templates` directory, `default_source_root` is not available and USAGE will not be displayed. USAGE should be also checked based on default directory excluding `templates`.
* \| \| \| \| \| \|	Merge pull request #5694 from hardipe/master	Santiago Pastorino	2012-04-01	1	-4/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tidy up cookies.rb a bit
\| * \| \| \| \| \| \|	Useless/Confusing method definition removed	hardi	2012-04-01	1	-4/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5684 from arunagw/warning_removed_railties	Vijay Dev	2012-04-01	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|	warning removed: `&' interpreted as argument prefix
\| * \| \| \| \| \| \|	warning removed: `&' interpreted as argument prefix	Arun Agrawal	2012-03-31	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-01	10	-19/+29
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	copy editing [ci skip]	Vijay Dev	2012-04-01	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	:success includes the whole 200 range, not just 200.	Erich Menge	2012-04-01	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# File lib/rack/response.rb, line 114 114: def successful?; @status >= 200 && @status < 300; end
\| * \| \| \| \| \| \|	Reorder bits in the Layouts and Rendering guide	Rafaël Blais Masson	2012-03-31	1	-7/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Introduce minor spelling corrections and fix broken markup tag.	Levi McCallum	2012-03-29	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make body background white for Lion scrollbar to be dark	Rafaël Blais Masson	2012-03-29	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	CSRF messages are no longer controlled by 422.html because ↵	Tony Primerano	2012-03-28	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	InvalidAuthenticityToken is not raised