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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| * \| \|	Routing guide: document lambda constraints and request argument.	Henrik N	2012-03-28	1	-0/+11
\| \| \| \|
\| * \| \|	Fix quotes at select_tag examples	Anderson Dias	2012-03-28	1	-1/+1
\| \| \| \|
\| * \| \|	Improved the comment for config.assets.manifest in the asset_pipeline guides.	Anuj Dutta	2012-03-28	1	-1/+1
\| \| \| \|
\| * \| \|	Changed the config.assets.manifest path in the comments to nil.	Anuj Dutta	2012-03-28	2	-2/+2
\| \| \| \|
* \| \| \|	Merge pull request #5691 from avakhov/form-label-block	José Valim	2012-04-01	2	-3/+17
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Block version of label should wrapped in field_with_errors in case of error
\| * \| \| \|	Small #label method refactoring, thanks @rafaelfranca	Alexey Vakhov	2012-04-01	1	-3/+2
\| \| \| \| \|
\| * \| \| \|	Block version of label should wrapped in field_with_errors in case of error	Alexey Vakhov	2012-04-01	2	-1/+16
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #5690 from nertzy/remove_naming_deprecation_include	José Valim	2012-04-01	1	-1/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Don't include deprecation in ActiveModel::Naming anymore
\| * \| \| \|	Don't include deprecation in AM::Naming anymore	Grant Hutchins	2012-03-31	1	-1/+0
\| \|/ / /
* \| \| \|	Merge pull request #5692 from avakhov/force-ssl-if-test	José Valim	2012-04-01	1	-0/+23
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Tests :if option of force_ssl method
\| * \| \|	Tests :if option of force_ssl method	Alexey Vakhov	2012-04-01	1	-0/+23
\|/ / /
* \| \|	use undef_method to avoid NameError exceptions all the time	Aaron Patterson	2012-03-31	1	-5/+1
\| \| \|
* \| \|	Remove not needed requires	Santiago Pastorino	2012-03-31	2	-2/+0
\| \|/ \|/\|
* \|	Merge pull request #5683 from arunagw/buffered_logger_test	Santiago Pastorino	2012-03-31	1	-3/+1
\|\ \ \| \| \| \| \| \|	No more BufferedLogger so it can be LoggerTest
\| * \|	no more deprecation required.	Arun Agrawal	2012-03-31	1	-2/+0
\| \| \|
\| * \|	No more BufferedLogger so it can be LoggerTest	Arun Agrawal	2012-03-31	1	-1/+1
\|/ /
* \|	Merge pull request #5679 from arunagw/warning_removed_master	Vijay Dev	2012-03-31	1	-1/+1
\|\ \ \| \| \| \| \| \|	warning removed: (...) interpreted as grouped expression
\| * \|	warning removed: (...) interpreted as grouped expression	Arun Agrawal	2012-03-31	1	-1/+1
\| \| \|
* \| \|	Merge pull request #5664 from lest/patch-1	Piotr Sarnacki	2012-03-31	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	use `symbolize_keys` instead of `dup.symbolize_keys!`
\| * \| \|	use `symbolize_keys` instead of `dup.symbolize_keys!`	Sergey Nartimov	2012-03-30	1	-2/+2
\| \| \| \|
* \| \| \|	Merge pull request #5674 from avakhov/ac-exception-remove-obsolete-member	Santiago Pastorino	2012-03-31	1	-2/+0
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Remove obsolete reader from AC::MethodNotAllowed exception class
\| * \| \|	Remove obsolete reader from AC::MethodNotAllowed exception class	Alexey Vakhov	2012-03-31	1	-2/+0
\| \| \| \|
* \| \| \|	use tsort_each to avoid intermediary array	Aaron Patterson	2012-03-30	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #4911 from Floppy/master	Aaron Patterson	2012-03-30	2	-1/+11
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Reduce FILENAME_MAX_SIZE in ActiveSupport::Cache::FileStore
\| * \| \|	Change FILENAME_MAX_SIZE in FileStore to 228.	James Smith	2012-02-06	2	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order that temp filenames generated from it will fit in 255 chars. See https://github.com/rails/rails/issues/4907
* \| \| \|	Merge pull request #5673 from avakhov/ac-render-exception	Piotr Sarnacki	2012-03-30	1	-3/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove AC::RenderError class second declaration
\| * \| \| \|	Remove AC::RenderError class second declaration	Alexey Vakhov	2012-03-31	1	-3/+0
\|/ / / /
* \| \| \|	Fix #5667. Preloading should ignore scoping.	Jon Leighton	2012-03-30	2	-2/+14
\| \| \| \|
* \| \| \|	Remove the leading \n added by textarea on assert_select	Santiago Pastorino	2012-03-30	3	-0/+10
\| \| \| \|
* \| \| \|	clear up duplication between Persistence#destroy and Locking#destroy	Jon Leighton	2012-03-30	2	-27/+34
\| \| \| \|
* \| \| \|	fix test	Jon Leighton	2012-03-30	1	-1/+2
\| \| \| \|