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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \|	Eliminate newlines in basic auth. fixes #2882	Aaron Patterson	2011-09-06	2	-1/+9
\| \| \| \|
* \| \| \|	Database adapters use a statement pool.	Aaron Patterson	2011-09-06	3	-8/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Database adapters use a statement pool for limiting the number of open prepared statments on the database. The limit defaults to 1000, but can be adjusted in your database config by changing 'statement_limit'.
* \| \| \|	adding a statement pool for mysql and sqlite3	Aaron Patterson	2011-09-06	3	-9/+102
\| \| \| \|
* \| \| \|	Merge pull request #2893 from dmathieu/errors_has_key	Aaron Patterson	2011-09-06	2	-0/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	add has_key? to ActiveModel::Errors
\| * \| \| \|	add has_key? to ActiveModel::Errors	Damien Mathieu	2011-09-06	2	-0/+7
\|/ / / /
* \| \| \|	Merge pull request #2577 from rails-noob/master	Santiago Pastorino	2011-09-06	2	-1/+51
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix double slash at start of paths when mounting an engine at the root.
\| * \| \| \|	Fix bug #2579.	rails-noob	2011-09-06	2	-1/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoids double slash at start of paths when mounting an engine at the root.
* \| \| \| \|	Merge pull request #2889 from guilleiguaran/perform-caching-assets	Santiago Pastorino	2011-09-06	2	-1/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	config.action_controller.perform_caching isn't used anymore in asset pipeline
\| * \| \| \| \|	config.action_controller.perform_caching isn't used anymore in assets ↵	Guillermo Iguaran	2011-09-06	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pipeline, instead we are using config.assets.digest now
* \| \| \| \| \|	Nested through associations: preloads from the default scope of a through ↵	Jon Leighton	2011-09-06	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	model should not be included in the association scope. (We're already excluding includes.) Fixes #2834.
* \| \| \| \| \|	Ensure we are not comparing a string with a symbol in ↵	Jon Leighton	2011-09-06	3	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	HasManyAssociation#inverse_updates_counter_cache?. Fixes #2755, where a counter cache could be decremented twice as far as it was supposed to be.
* \| \| \| \| \|	Make the logic easier to read	Jon Leighton	2011-09-06	1	-4/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Disable active record marshalling tests on Ruby 1.8.7 on Travis CI, as they ↵	Jon Leighton	2011-09-06	2	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	have been failing intermittently for a long while due to what appears to be a Ruby bug. If anyone has the skills/expertise/time to debug this, please speak to the Travis guys.
* \| \| \| \| \|	Merge pull request #2883 from dmathieu/fix_test	Jon Leighton	2011-09-06	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#first doesn't take an order in this test
\| * \| \| \| \| \|	#first doesn't take an order in this test	Damien Mathieu	2011-09-06	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2851 from dasch/patch-6	Jon Leighton	2011-09-06	1	-5/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	No need to use a begin block there
\| * \| \| \| \| \|	No need to use a begin block there	Daniel Schierbeck	2011-09-04	1	-5/+3
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Bump uglifier up	Santiago Pastorino	2011-09-05	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2870 from arunagw/uglifier_bump	Santiago Pastorino	2011-09-05	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uglifier bump
\| * \| \| \| \| \|	Uglifier bump	Arun Agrawal	2011-09-05	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2877 from dmathieu/fix_tests_pg_18	Santiago Pastorino	2011-09-05	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Last orders the records by id
\| * \| \| \| \| \| \|	first and last orders the records by id	Damien Mathieu	2011-09-06	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2716 from jbbarth/fix_invert_rename_index	Aaron Patterson	2011-09-05	2	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bad options order in AR::Migration::CommandRecorder#invert_rename_index
\| * \| \| \| \| \| \| \|	Fixed bad options order in ↵	jbbarth	2011-08-28	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveRecord::Migration::CommandRecorder#invert_rename_index
* \| \| \| \| \| \| \| \|	Don't find belongs_to target when the foreign_key is NULL. Fixes #2828	Georg Friedrich	2011-09-05	2	-0/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2873 from guilleiguaran/remove-unused-config	Santiago Pastorino	2011-09-05	1	-3/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused config variable from test.rb template
\| * \| \| \| \| \| \| \| \|	Remove unused config variable from test.rb template	Guillermo Iguaran	2011-09-05	1	-3/+0
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2872 from sikachu/content_tag_html_safe	Santiago Pastorino	2011-09-05	2	-1/+13
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure that result from content_tag_for with collection is html_safe
\| * \| \| \| \| \| \| \| \|	Make sure that result from content_tag_for with collection is html_safe	Prem Sichanugrist	2011-09-05	2	-1/+13
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thank you @spastorino for catching the empty test in b84cee0, as I totally forgot that I still have to make it html_safe.
* \| \| \| \| \| \| \| \|	Merge pull request #2815 from avakhov/current-page-non-get-requests	Santiago Pastorino	2011-09-05	2	-2/+16
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	current_page? returns false for non-GET requests
\| * \| \| \| \| \| \| \| \|	current_page? returns false for non-GET requests	Alexey Vakhov	2011-09-02	2	-2/+16
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #2799 from tomstuart/3-1-stable	Santiago Pastorino	2011-09-05	2	-3/+39
\| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Never return stored content from content_for when a block is given
* \| \| \| \| \| \| \| \|	Merge pull request #2789 from dmathieu/limit_first_last	Jon Leighton	2011-09-05	2	-2/+32
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use LIMIT SQL word in first - Closes #2783
\| * \| \| \| \| \| \| \| \|	Use LIMIT sql word in last when it's possible	Damien Mathieu	2011-09-05	2	-2/+23
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	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.