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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #5294 from robinroestenburg/master	Aaron Patterson	2012-03-12	3	-26/+53
\|\
\| *	Removed flag attributes.	Robin Roestenburg	2012-03-06	3	-22/+35
\| *	Refactored method arel_attributes_values.	Robin Roestenburg	2012-03-06	1	-20/+34
* \|	make sure connections returned after close are marked as in_use	Aaron Patterson	2012-03-12	2	-4/+27
* \|	make the tagged formatter extend the existing formatter	Aaron Patterson	2012-03-12	1	-2/+2
* \|	Merge pull request #5394 from erichmenge/master	Aaron Patterson	2012-03-12	2	-0/+5
\|\ \
\| * \|	Allow retrieve_cache_key to work on collections such as ActiveRecord::Relation.	Erich Menge	2012-03-12	2	-0/+5
* \| \|	Merge pull request #5375 from nertzy/assert_template_with_regexp	Aaron Patterson	2012-03-12	2	-2/+13
\|\ \ \
\| * \| \|	assert_template matches against Regexp	Grant Hutchins	2012-03-10	2	-2/+13
* \| \| \|	Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_separator	Aaron Patterson	2012-03-12	2	-1/+5
\|\ \ \ \
\| * \| \| \|	ensure u2029 is escaped in escape_javascript helper	benmmurphy	2012-03-11	2	-1/+5
* \| \| \| \|	Merge pull request #5393 from jrochkind/clear_to_reap	Aaron Patterson	2012-03-12	1	-1/+2
\|\ \ \ \ \
\| * \| \| \| \|	deprecated clear_stale_active_connections! can call #reap instead of no-op'in...	Jonathan Rochkind	2012-03-12	1	-1/+2
\|/ / / / /
* \| \| \| \|	Add documentation for find_or_create_by_{attribute}! method.	Andrew White	2012-03-12	2	-0/+5
* \| \| \| \|	Add dynamic find_or_create_by_{attribute}! method.	Andrew White	2012-03-12	7	-2/+80
* \| \| \| \|	Merge pull request #5390 from arunagw/picked_commits	José Valim	2012-03-12	2	-1/+5
\|\ \ \ \ \
\| * \| \| \| \|	fix activerecord query_method regression with offset into Fixnum	Denis Jean	2012-03-12	2	-1/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #5387 from panthomakos/autoload	José Valim	2012-03-12	1	-4/+7
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Improved ActiveSupport::Autoload performance.	Pan Thomakos	2012-03-11	1	-4/+7
\|/ / / /
* \| \| \|	Merge pull request #5366 from parndt/fix_issue_5324	José Valim	2012-03-11	10	-208/+207
\|\ \ \ \
\| * \| \| \|	Documented the removal of size from text_field based helpers and cols, rows f...	Philip Arndt	2012-03-12	1	-0/+4
\| * \| \| \|	Fix unintended removal of 'cols' from a text_area example.	Philip Arndt	2012-03-12	1	-1/+1
\| * \| \| \|	Fixes #5324 by removing default size options from input:text and default cols...	Philip Arndt	2012-03-10	9	-209/+204
* \| \| \| \|	Merge pull request #5372 from jsl/add_before_send_to_actionmailer	José Valim	2012-03-11	2	-0/+74
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Add ability to define callbacks in ActionMailer using AbstractController::Cal...	Justin S. Leitgeb	2012-03-11	2	-0/+74
\|/ / / /
* \| \| \|	Merge pull request #5373 from nertzy/fix_comments_about_to_partial_path	José Valim	2012-03-11	2	-3/+3
\|\ \ \ \
\| * \| \| \|	Fix comments about to_partial_path	Grant Hutchins	2012-03-10	2	-3/+3
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #5326 from lest/patch-2	Michael Koziarski	2012-03-10	4	-9/+37
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	configure how unverified request will be handled	Sergey Nartimov	2012-03-09	4	-9/+37
* \| \| \|	@controller already includes url_helpers in with_routing method	Santiago Pastorino	2012-03-10	1	-1/+0
* \| \| \|	Add missing require	Santiago Pastorino	2012-03-10	1	-0/+1
* \| \| \|	Fix broken tests	Santiago Pastorino	2012-03-10	2	-1/+4
* \| \| \|	Merge pull request #5371 from jsl/fix_actionmailer_tests	José Valim	2012-03-10	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix actionmailer tests broken by #4751a69	Justin S. Leitgeb	2012-03-10	1	-1/+1
\|/ / / /
* \| \| \|	AbstractController.action_methods should return a Set	Santiago Pastorino	2012-03-10	2	-3/+4
* \| \| \|	Merge pull request #5367 from carlosantoniodasilva/middleware-api	Santiago Pastorino	2012-03-10	5	-24/+67
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Change api_only to http_only	Carlos Antonio da Silva	2012-03-10	5	-21/+20
\| * \| \|	Add some docs for MiddlewareStackProxy methods and api_only!	Carlos Antonio da Silva	2012-03-10	3	-5/+49
\|/ / /
* \| \|	Merge pull request #5364 from carlosantoniodasilva/active-model-serialization...	José Valim	2012-03-10	2	-24/+18
\|\ \ \
\| * \| \|	Rename variable to avoid using name "include"	Carlos Antonio da Silva	2012-03-09	1	-8/+4
\| * \| \|	Remove Array#wrap usage in AMo serialization	Carlos Antonio da Silva	2012-03-09	1	-2/+1
\| * \| \|	Make sure serializable hash with :include always returns string keys	Carlos Antonio da Silva	2012-03-09	2	-15/+14
\|/ / /
* \| \|	Install latest bundler on Travis.	José Valim	2012-03-09	1	-0/+2
* \| \|	Bump bundler dependency.	José Valim	2012-03-09	1	-1/+1
* \| \|	Merge pull request #5356 from carlosantoniodasilva/rake-test-system	José Valim	2012-03-09	4	-106/+98
\|\ \ \
\| * \| \|	Use one system call whenever possible, group rake and Dir.chdir calls	Carlos Antonio da Silva	2012-03-08	4	-106/+98
* \| \| \|	Merge pull request #5352 from avakhov/ar_finder_sql_uniq_ids	José Valim	2012-03-09	2	-1/+8
\|\ \ \ \
\| * \| \| \|	In AR depths use &:to_i before :uniq to process mixed arrays likes ["1", 1] c...	Alexey Vakhov	2012-03-09	2	-1/+8
\|/ / / /
* \| \| \|	Merge pull request #5351 from shanna/master	José Valim	2012-03-08	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Added missing ActiveModel::Naming dependency.	Shane Hanna	2012-03-09	1	-0/+1