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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \|	use LIMIT SQL word in first - Closes #2783	Damien Mathieu	2011-09-05	2	-1/+10
\|/ / / / / / / / /
* \| / / / / / / /	add blanks between methods	Vijay Dev	2011-09-05	1	-0/+3
\| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2868 from arunagw/batches_test_pg_master	Jon Leighton	2011-09-05	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sort here to make sure the order is ok.
\| * \| \| \| \| \| \| \|	Sort here to make sure the order is ok.	Arun Agrawal	2011-09-05	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #2713 from FLOChip/500-fixed	José Valim	2011-09-05	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove misleading line on 500 error page. #2648
\| * \| \| \| \| \| \| \|	remove misleading line on 500 error page.	Teng Siong Ong	2011-08-27	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fixed 500 error message which is misleading by suggesting all rails apps ↵	Jared Tame	2011-08-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	have exception notifications by default
* \| \| \| \| \| \| \| \|	Remove empty test	Santiago Pastorino	2011-09-05	1	-3/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2863 from ↵	Santiago Pastorino	2011-09-04	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	raybaxter/silence_unitialized_instance_variable_warnings Silence unitialized instance variable warnings
\| * \| \| \| \| \| \| \| \|	Tests shouldn't produce warnings	Ray Baxter	2011-09-04	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #2861 from guilleiguaran/assets-fix-changelog	Santiago Pastorino	2011-09-04	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \|	Add entry about Asset behaviour fix to ActionPack ChangeLog
\| * \| \| \| \| \| \| \| \|	Add entry about Asset behaviour fix to ActionPack ChangeLog	Guillermo Iguaran	2011-09-04	1	-0/+3
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #2860 from guilleiguaran/fix-assets-behavior	Santiago Pastorino	2011-09-04	2	-2/+28
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix AssetNotPrecompiledError behavior
\| * \| \| \| \| \| \| \| \|	AssetNotPrecompiledError should be raise when config.assets.digest = false, ↵	Guillermo Iguaran	2011-09-04	2	-2/+28
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config.assets.compile = false and manifest file isn't present
* \| \| \| \| \| \| \| \|	* is not allowed in windows file names. Closes #2574 #2847	Santiago Pastorino	2011-09-04	2	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2855 from arunagw/fix_find_in_batches_master	Jon Leighton	2011-09-04	3	-1/+31
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	We need to recorder here. Need to drop the order from default scope.
\| * \| \| \| \| \| \| \|	We need to recorder here. Need to drop the order from default scope.	Arun Agrawal	2011-09-05	3	-1/+31
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2832
* \| \| \| \| \| \| \|	Merge pull request #2852 from milandobrota/remove_unneeded_explicit_nil_checks	Jon Leighton	2011-09-04	7	-11/+11
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|	if ... nil? is more expensive than unless
\| * \| \| \| \| \| \|	if ... nil? is more expensive than unless	Milan Dobrota	2011-09-04	7	-11/+11
\|/ / / / / / /
* \| \| \| \| \| \|	Merge docrails, resolving conflicts in the assets guide	Vijay Dev	2011-09-04	9	-24/+26
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	minor fixes in assets guide	Vijay Dev	2011-09-04	1	-11/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #64 from rinaldifonseca/master	Guillermo Iguaran	2011-09-03	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added \|t\| to create_table block
\| \| * \| \| \| \| \| \|	Added \|t\| to create_table block	Rinaldi Fonseca	2011-09-04	1	-1/+1
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	add some missing dots in the docs	Vijay Dev	2011-09-04	1	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix asset_path example in CSS and ERB section	Guillermo Iguaran	2011-09-02	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	document send_file guesses content type from the file extension	Vijay Dev	2011-09-03	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and remove info about x_send_file option to send_file
\| * \| \| \| \| \| \|	fix YUI description	Richard Hulse	2011-09-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	YUI CSS compressor does not extend syntax! Also added link to more info
\| * \| \| \| \| \| \|	Fixed a typo in the section about migration.	David Peckham	2011-09-02	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	some of the changes for validation earlier reverted from d20281a	Vijay Dev	2011-09-03	3	-4/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change photos_path to photos_url in Using redirect_to	Franco Catena	2011-09-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Is more "correct" a complete url than only the path
* \| \| \| \| \| \| \|	Merge pull request #2848 from arunagw/jruby_activesupport_fix	Jon Leighton	2011-09-04	1	-4/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Need to have a check here for JAVA PLATFORM for JRuby
\| * \| \| \| \| \| \| \|	We can't simply check the first line of the backtrace,	Arun Agrawal	2011-09-04	1	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	because JRuby reports the call to __send__ in the backtrace.
* \| \| \| \| \| \| \| \|	Revert "Fixes bug in ActiveRecord::QueryMethods, #1697"	Jon Leighton	2011-09-04	2	-7/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 0df27c98d982ec87d2fb48cfda82694eb267993e. Reverted due to failing test, see #2845.
* \| \| \| \| \| \| \| \|	Merge pull request #2841 from wojtekmach/app-generators-group	José Valim	2011-09-04	4	-1/+61
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add gem group support to generators
\| * \| \| \| \| \| \| \| \|	Add gem_group support to generators	Wojciech Mach	2011-09-04	4	-1/+61
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #2816 from sikachu/content_tag_for	José Valim	2011-09-04	4	-7/+166
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Make `content_tag_for` and `div_for` accepts the array of records
\| * \| \| \| \| \| \| \| \|	Make `content_tag_for` and `div_for` accepts the array of records	Prem Sichanugrist	2011-09-04	4	-7/+166
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So instead of having to do this: @items.each do \|item\| content_tag_for(:li, item) do Title: <%= item.title %> end end You can now do this: content_tag_for(:li, @items) do \|item\| Title: <%= item.title %> end
* \| \| \| \| \| \| \| \| \|	Remove useless parens	Santiago Pastorino	2011-09-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #2844 from arunagw/warnings_removed_master	Santiago Pastorino	2011-09-03	12	-37/+37
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Warnings removed from master
\| * \| \| \| \| \| \| \| \| \|	Modified content in guides and comments	Arun Agrawal	2011-09-04	4	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for "assert /" warnings. Removed because if somebody will use this code they will get warnings!
\| * \| \| \| \| \| \| \| \| \|	Warnings removed for "assert_match /" Please do	Arun Agrawal	2011-09-04	6	-25/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not add more.!
\| * \| \| \| \| \| \| \| \| \|	Warnings removed for using shadow variable.	Arun Agrawal	2011-09-04	2	-4/+4
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	restores the API docs of AR::Fixtures, made a quick pass over them, revises ↵	Xavier Noria	2011-09-03	3	-370/+363
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	link in fixture template [closes #2840]
* \| \| \| \| \| \| \| \| \|	Merge pull request #2835 from guilleiguaran/actionpack-changelog	Santiago Pastorino	2011-09-03	1	-2/+2
\| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include ticket numbers in AP CHANGELOG
* \| \| \| \| \| \| \| \|	Merge pull request #2836 from avakhov/action-controller-helpers-desc	Vijay Dev	2011-09-03	1	-3/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix helpers behavior description
\| * \| \| \| \| \| \| \| \|	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 and add it to default Gemfile
\| * \| \| \| \| \| \| \| \|	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