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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master-sec'	Aaron Patterson	2012-06-12	2	-2/+8
\|\
\| *	Array parameters should not contain nil values.	Aaron Patterson	2012-06-12	2	-2/+8
* \|	Merge pull request #6715 from arunagw/add_asserts	Rafael Mendonça França	2012-06-12	1	-2/+2
\|\ \
\| * \|	Need a assert here in tests	Arun Agrawal	2012-06-12	1	-2/+2
\|/ /
* \|	Merge pull request #6676 from aurelian/master	Rafael Mendonça França	2012-06-12	2	-1/+5
\|\ \
\| * \|	Don't assign the attributes if the list is empty.	Aurelian Oancea	2012-06-08	2	-1/+5
* \| \|	content_type is already a Mime::Type object	Santiago Pastorino	2012-06-12	1	-1/+1
* \| \|	This consider_all_requests_local doesn't make sense	Santiago Pastorino	2012-06-12	2	-21/+2
* \| \|	Merge pull request #6444 from kennyj/create_extenstion_hstore	Rafael Mendonça França	2012-06-12	2	-0/+12
\|\ \ \
\| * \| \|	Create hstore extension when building PostgreSQL databases.	kennyj	2012-06-12	2	-0/+12
\|/ / /
* \| \|	Merge pull request #6711 from takkanm/fix-warning-LoadError-path-method	José Valim	2012-06-12	1	-5/+7
\|\ \ \
\| * \| \|	fix method redefined warning in Ruby2.0	Mitsutaka Mimura	2012-06-12	1	-5/+7
* \| \| \|	Stop relying on mutable structures in the FileUpdateChecker	José Valim	2012-06-12	2	-35/+7
\|/ / /
* \| /	Remove warnings and unused code	Rafael Mendonça França	2012-06-11	2	-7/+2
\| \|/ \|/\|
* \|	No need to cache table metadata in advance now that #6683 was merged.	Rafael Mendonça França	2012-06-11	2	-16/+0
* \|	Return proper format on exceptions	Santiago Pastorino	2012-06-11	3	-14/+81
* \|	Merge pull request #6492 from pmahoney/fair-connection-pool2	Rafael Mendonça França	2012-06-11	5	-38/+286
\|\ \
\| * \|	Make connection pool fair with respect to waiting threads.	Patrick Mahoney	2012-05-25	4	-38/+282
\| * \|	Cache metadata in advance to avoid extra sql statements while testing.	Yasuo Honda	2012-05-25	1	-0/+7
* \| \|	Merge pull request #6709 from amatsuda/sqlite3_version_is_always_gt_125	Rafael Mendonça França	2012-06-11	1	-1/+1
\|\ \ \
\| * \| \|	current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6	Akira Matsuda	2012-06-12	1	-1/+1
* \| \| \|	Merge pull request #6708 from amatsuda/ignore_git_ignored_files_in_rake_test_...	José Valim	2012-06-11	1	-1/+1
\|\ \ \ \
\| * \| \| \|	ignore .gitignore'd files in rake test:uncomitted	Akira Matsuda	2012-06-12	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #6706 from amatsuda/ar_timezone_format_test_tiny_fix	Rafael Mendonça França	2012-06-11	1	-1/+1
\|\ \ \ \
\| * \| \| \|	TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9	Akira Matsuda	2012-06-12	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #6705 from ganeshkumar/string_method_changes	Rafael Mendonça França	2012-06-11	2	-8/+8
\|\ \ \ \
\| * \| \| \|	both string and sumbol will be interpolated as string no need to convert to_s	ganesh	2012-06-11	2	-8/+8
* \| \| \| \|	Merge pull request #6704 from amatsuda/lambda_respond_to_binding	José Valim	2012-06-11	1	-43/+39
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Proc always respond_to :binding	Akira Matsuda	2012-06-12	1	-43/+39
\| \|/ / /
* \| \| \|	Merge pull request #6690 from suginoy/fix-templates-copy	Rafael Mendonça França	2012-06-11	2	-1/+12
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Added a testcase for #6690.	kennyj	2012-06-12	1	-0/+11
\| * \| \|	fix stylesheet template dir	Sugino Yasuhiro	2012-06-09	1	-1/+1
* \| \| \|	Merge pull request #6699 from takkanm/fix-character-class-duplicated-range-wa...	Rafael Mendonça França	2012-06-11	1	-1/+1
\|\ \ \ \
\| * \| \| \|	fix warning in Ruby2.0.0	takkanm	2012-06-11	1	-1/+1
* \| \| \| \|	Merge pull request #6698 from yahonda/address_ora_911_master	Rafael Mendonça França	2012-06-10	2	-2/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Address ORA-00911 errors because of the heading underscore.	Yasuo Honda	2012-06-11	2	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #6521 from Empact/throw-result	Rafael Mendonça França	2012-06-10	2	-1/+8
\|\ \ \ \
\| * \| \| \|	Fix that #exists? raises ThrowResult when called with an empty limited	Ben Woosley	2012-06-10	2	-1/+8
\|/ / / /
* \| \| \|	Remove bundle exec from the exception message	Rafael Mendonça França	2012-06-10	1	-1/+1
* \| \| \|	Add test to column alias in `exists?` SQL.	Rafael Mendonça França	2012-06-10	2	-1/+7
* \| \| \|	Minimal change to query generation of exists? that makes SQLServer and others...	iaddict	2012-06-10	1	-1/+1
* \| \| \|	Merge pull request #6695 from kennyj/fix_6635	Rafael Mendonça França	2012-06-10	2	-5/+14
\|\ \ \ \
\| * \| \| \|	Fix #6635. We should call Scoping methods, before calling Array methods.	kennyj	2012-06-10	2	-5/+14
* \| \| \| \|	Ensure that mass assignment options are preserved	Andrew White	2012-06-10	4	-11/+55
\|/ / / /
* \| \| \|	Merge pull request #6694 from arunagw/build_fix_master	José Valim	2012-06-10	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fba	Arun Agrawal	2012-06-10	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #6692 from schneems/schneems/something-went-wrong	José Valim	2012-06-10	2	-0/+2
\|\ \ \ \
\| * \| \| \|	add prompt to 404 & 500 pages to check logs	schneems	2012-06-09	2	-0/+2
* \| \| \| \|	Use . instead of :: for class methods, add CHANGELOG entries	José Valim	2012-06-10	5	-5/+10
* \| \| \| \|	Merge pull request #6665 from schneems/schneems/raise-migration-error	José Valim	2012-06-10	6	-0/+74
\|\ \ \ \ \