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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \|	remove to_sql from TableDefinition	Aaron Patterson	2013-03-22	3	-9/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	decouple column definition from the database connection	Aaron Patterson	2013-03-22	3	-11/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	stop depending on sql_type in pg	Aaron Patterson	2013-03-22	1	-6/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	remove knowledge of SQL from the column definition object	Aaron Patterson	2013-03-22	3	-24/+47
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	squelch an unused variable warning	Aaron Patterson	2013-03-22	1	-0/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #9866 from choudhuryanupam/fix_connection_test	Carlos Antonio da Silva	2013-03-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed unused loop variable
\| * \| \| \| \| \| \| \| \|	Removed unused loop variable	Anupam Choudhury	2013-03-22	1	-1/+1
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #9867 from choudhuryanupam/fix_mysql2_active_schema_test	Carlos Antonio da Silva	2013-03-22	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed unnecessary block
\| * \| \| \| \| \| \| \| \|	Removed unnecessary block	Anupam Choudhury	2013-03-22	1	-2/+1
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	test-case to prevent resetting associations when preloading twice.	Yves Senn	2013-03-22	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/associations/preloader/through_association.rb activerecord/test/cases/associations/eager_test.rb
* \| \| \| \| \| \| \| \|	When we pass id to update_attributes it will try to set new id for that record	Dmitry Vorotilin	2013-03-22	4	-2/+18
\|/ / / / / / / /
* / / / / / / /	Delete failing test	Jon Leighton	2013-03-22	1	-36/+0
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I don't think this is testing anything useful, and the test code is exceedingly brittle. It is broken since 34c7e73c1def1312e59ef1f334586ff2f668246e because the test code makes assumptions about the implementation of PostgreSQLAdapter#active? which are incorrect after the commit. I could fix this test but it would be even more brittle (by stubbing the underlying @connection.connect_poll) and it doesn't test any complex logic. I conclude that it's not worth it.
* \| \| \| \| \| \|	Allows setting fixture_path to a Pathname	Alexander Murmann and Can Berk Güder	2013-03-21	2	-1/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Adding a bang to method name of raise_on_type_mismatch.	wangjohn	2013-03-21	6	-8/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #9847 from vipulnsward/fix_sqlite_test	Rafael Mendonça França	2013-03-21	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Fix copy table index test; Change == to ! on false in travis.rb
\| * \| \| \| \| \|	Fix copy table index test; Change == to ! on false in travis.rb	Vipul A M	2013-03-21	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Update other counter caches on destroy	Ian Young	2013-03-20	11	-9/+45
\|/ / / / / /
* \| \| \| \| \|	use `connect_poll` on pg so that reaping does not hurt the connection	Aaron Patterson	2013-03-20	2	-3/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Revert "default the reaping frequency to 10 seconds"	Aaron Patterson	2013-03-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql can't handle a parallel thread pinging the connection, so we can get wrong results or segvs This reverts commit 7cc588b684f6d1af3e7fab1edfa6715e269e41a2.
* \| \| \| \| \|	Merge pull request #9833 from choudhuryanupam/fix_active_schema_test	Carlos Antonio da Silva	2013-03-20	1	-2/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed unnecessary block
\| * \| \| \| \| \|	Removed unnecessary block	Anupam Choudhury	2013-03-20	1	-2/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Properly named variable inside block	Anupam Choudhury	2013-03-20	1	-2/+2
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #9824.
* \| \| \| \| \|	Merge pull request #9821 from vipulnsward/fix_typos_in_AR	Vijay Dev	2013-03-20	5	-6/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix some typos in AR- CHANGELOG, tests, method doc. fixed
\| * \| \| \| \| \|	Fix some typos in AR- CHANGELOG, tests, method doc. fixed	Vipul A M	2013-03-20	5	-6/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix a typo	Rajeev N Bharshetty	2013-03-20	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #9818 from wangjohn/sort_last_to_max_in_migration_version	Carlos Antonio da Silva	2013-03-19	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed the call to .sort.last to .max when computing the migration version
\| * \| \| \| \| \|	Changed the call to .sort.last to .max when computing the migration version. You	wangjohn	2013-03-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do not actually need to sort everything (incurs more cost than just a simple max).
* \| \| \| \| \| \|	Commas aren't comas.	Josh Adams	2013-03-19	1	-2/+2
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Type a fixo.
* \| \| \| \| \|	Calling find() on an association with an inverse will now check to see	wangjohn	2013-03-19	3	-2/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	if the association already holds that record in memory before checking the database for the specified ids.
* \| \| \| \| \|	The repair_validations helper was not working correctly before because	wangjohn	2013-03-19	1	-2/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it only cleared the validations that created :validate callbacks. This didn't include the validates created by validates_with, so I've added a method to clear all validations.
* \| \| \| \|	Revert "Merge pull request #9784 from ↵	Carlos Antonio da Silva	2013-03-18	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	vipulnsward/change_from_blank_to_empty_on_string" This reverts commit 9c4c05fc82e997b722dec4068c3aa27eaee69eb8, reversing changes made to 4620bdcefd0c88905a005f191496df887877b8f3. Reason: They're not completely interchangeable, since blank? will also check for strings containing spaces.
* \| \| \| \|	Merge pull request #9784 from vipulnsward/change_from_blank_to_empty_on_string	Carlos Antonio da Silva	2013-03-18	1	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Change from blank? to empty? on obvious string values to save extra calls
\| * \| \| \| \|	change from blank? to empty? on obvious string values to save extra method ↵	Vipul A M	2013-03-19	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	calls
* \| \| \| \| \|	Fix failing tests related to where values change to strings	Carlos Antonio da Silva	2013-03-18	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduced in 5dc2e3531babcbdc165884d1a47cbcd13455522d.
* \| \| \| \| \|	Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"	Xavier Noria	2013-03-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57.
* \| \| \| \| \|	Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtm	Rafael Mendonça França	2013-03-18	2	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change from each to each_value;drop assignment in habtm
\| * \| \| \| \| \|	1. Change from each to each_value since we did not use key	Vipul A M	2013-03-19	2	-3/+3
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	2. drop assignment of value to sum in test
* \| \| \| \| \|	instruct RDoc to only parse Ruby files under lib [Fixes #9779]	Xavier Noria	2013-03-18	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #9778 from vipulnsward/fix_typos_in_ar_v1	Steve Klabnik	2013-03-18	9	-10/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix typos in AR. lots of them.
\| * \| \| \| \| \|	fix typos in AR. lots of them.	Vipul A M	2013-03-19	9	-10/+10
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'master-sec'	Aaron Patterson	2013-03-18	2	-11/+16
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854]
\| * \| \| \| \|	stop calling to_sym when building arel nodes [CVE-2013-1854]	Aaron Patterson	2013-03-15	2	-11/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #9766 from senny/remove_ancient_todos	Carlos Antonio da Silva	2013-03-18	1	-3/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove ancient TODOs [ci skip]
\| * \| \| \| \| \|	remove ancient TODOs [ci skip].	Yves Senn	2013-03-18	1	-3/+0
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #9765 from tkhr/mv-tests-out-from-base_testrb	Carlos Antonio da Silva	2013-03-18	2	-14/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move tests out from base_test.rb to inheritance_test.rb
\| * \| \| \| \| \|	move tests out from base_test.rb	Takehiro Adachi	2013-03-18	2	-14/+14
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These tests should be in inheritance_test.rb since its testing a feature which is implemented in inheritance.rb
* \| \| \| \| \|	Merge pull request #9677 from neerajdotname/update-comments-about-kotori	Carlos Antonio da Silva	2013-03-18	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	SQLite3 3.6.8+ supports nested transactions [ci skip]
\| * \| \| \| \|	SQLite3 3.6.8+ supports nested transactions [ci skip]	Neeraj Singh	2013-03-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	http://www.sqlite.org/lang_savepoint.html https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L130-L132
* \| \| \| \| \|	`rake db:create` does not change permissions of root user.	Yves Senn	2013-03-17	3	-3/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #8079. I had to rework some of the tests because the mock allowed any arguments for `connection.exeucte`. I think this is very dangerous as there could anything be executed without the tests noticing it.
* \| \| \| \| \|	sets limit 191 for schema_migrations#version in mysql2 if the encoding is ↵	Xavier Noria	2013-03-17	4	-5/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"utf8mb4" Please, see rationale in the included CHANGELOG patch.