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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	clear and disable query cache when an exception is raised from called middleware	Aaron Patterson	2011-08-28	2	-1/+33
\| \|/ / / \|/\| \| \|
* \| \| \|	stop messing with the load path, load path should be adjusted in the test task	Aaron Patterson	2011-08-26	1	-7/+0
\| \| \| \|
* \| \| \|	Force binary data inserted for a string data type to utf-8 and log an	Aaron Patterson	2011-08-25	2	-3/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	error. Strings tagged as binary will be stored in sqlite3 as blobs. It is an error to insert binary data to a string column, so an error is emitted in the log file. People are highly encouraged to track down the source of the binary strings and make sure that the encoding is set correctly before inserting to the database.
* \| \| \|	Merge pull request #2679 from amatsuda/nullify_abstract_class_table_name	Aaron Patterson	2011-08-24	2	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	do not compute table names for abstract classes
\| * \| \| \|	do not compute table names for abstract classes	Akira Matsuda	2011-08-24	2	-0/+6
\| \| \| \| \|
* \| \| \| \|	Adding missing autoload	Claudio Poli	2011-08-24	1	-0/+1
\|/ / / /
* \| \| \|	Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251	Santiago Pastorino	2011-08-22	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Use mysql_creation_options inside rescue block
\| * \| \| \|	Use mysql_creation_options inside rescue block	Jonathon M. Abbott	2011-08-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commit ecd37084b28a05f05251 did not take into account the use of creation_options inside the access denied exception handler.
* \| \| \| \|	Merge pull request #2600 from al/finder_sql_example_update	Xavier Noria	2011-08-21	1	-6/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Updated the docs for the has_many :finder_sql option
\| * \| \| \| \|	Updated the docs for the has_many :finder_sql option to reflect changes made ↵	Alan Larkin	2011-08-20	1	-6/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in #a7e19b30ca71f62af516, i.e. the use of Procs when interpolation of the SQL is required.
* \| \| \| \| \|	Fix PredicateBuilder clobbering select_values in subquery.	Ernie Miller	2011-08-20	2	-1/+14
\| \| \| \| \| \|
* \| \| \| \| \|	Fix assumption of primary key name in PredicateBuilder subquery.	Ernie Miller	2011-08-20	2	-1/+11
\|/ / / / /
* \| \| \| \|	prevent sql injection attacks by escaping quotes in column names	Aaron Patterson	2011-08-16	4	-3/+20
\| \| \| \| \|
* \| \| \| \|	In 1efd88283ef68d912df215125951a87526768a51, ConnectionAdapters was put ↵	Jon Leighton	2011-08-16	3	-14/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	under eager_autoload. Due to the requires in that file, this caused ConnectionSpecification to be loaded, which references ActiveRecord::Base, which means the database connection is established. We do not want to connect to the database when Active Record is loaded, only when ActiveRecord::Base is first referenced by the user.
* \| \| \| \|	Revert "Merge pull request #2543 from htanata/unused_require_in_ar_test"	Santiago Pastorino	2011-08-16	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 87152f2604e73b218df90befda576f0acfed0bbf, reversing changes made to 0d3615f04c79f6e90d8ab33fdfc920b8faac9cb8.
* \| \| \| \|	Remove unused require.	Hendy Tanata	2011-08-16	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Bump arel dependency	Jon Leighton	2011-08-15	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Use new SelectManager#source method	Jon Leighton	2011-08-15	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Use new SelectManager#projections= method	Jon Leighton	2011-08-15	3	-4/+4
\| \| \| \| \|
* \| \| \| \|	use update.key instead of update.ast.key. make better use of select manager.	Jon Leighton	2011-08-15	3	-26/+18
\| \| \| \| \|
* \| \| \| \|	Use a SelectCore rather than a full SelectManager	Jon Leighton	2011-08-15	2	-4/+6
\| \| \| \| \|
* \| \| \| \|	Refactor building the update manager	Jon Leighton	2011-08-15	4	-16/+13
\| \| \| \| \|
* \| \| \| \|	Support for multi-table updates with limits, offsets and orders	Jon Leighton	2011-08-15	4	-2/+77
\| \| \| \| \|
* \| \| \| \|	Support updates with joins. Fixes #522.	Jon Leighton	2011-08-15	5	-4/+34
\| \| \| \| \|
* \| \| \| \|	Ensure empty has_many :through association preloaded via joins is marked as ↵	Jon Leighton	2011-08-15	2	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	loaded. Fixes #2054.
* \| \| \| \|	Fix private methods which are delegated to. This previously worked because ↵	Jon Leighton	2011-08-15	2	-13/+13
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Module#delegate previously ignored method visibility.
* \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Xavier Noria	2011-08-13	2	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile
\| * \| \| \|	Document exclamation point on dynamic finders	Florent Guilleux	2011-08-13	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Rubygems => RubyGems	Sukeerthi Adiga	2011-08-13	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Quote these dates to prevent intermittent test failure. Suppose local time ↵	Jon Leighton	2011-08-13	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is 00:50 GMT+1. Without the quoting, the YAML parser would parse this as 00:50 UTC, into the local time of 01:50 GMT+1. Then, it would get written into the database in local time as 01:50. When it came back out the UTC date from the database and the UTC date of two weeks ago would be compared. The former would be 23:50, and the latter would be 00:50, so the two dates would differ, causing the assertion to fail. Quoting it prevents the YAML parser from getting involved.
\| * \| \| \|	accept option for recreate db for postgres (same as mysql now)	artemk	2011-08-13	1	-2/+4
\| \| \| \| \|
\| * \| \| \|	initializing @open_transactions in the initialize method	Aaron Patterson	2011-08-13	1	-4/+2
\| \| \| \| \|
\| * \| \| \|	add a migrate class method and delegate to the new instance	Aaron Patterson	2011-08-13	1	-1/+4
\| \| \| \| \|
\| * \| \| \|	Ensure that .up and .down work as well.	Christopher Meiklejohn	2011-08-13	1	-2/+13
\| \| \| \| \|
\| * \| \| \|	Support backwards compatible interface for migration down/up with rails 3.0.x.	Christopher Meiklejohn	2011-08-13	2	-0/+25
\| \| \| \| \|
\| * \| \| \|	remove extra require for 'stringio' as it is required in helper.rb	Vishnu Atrai	2011-08-13	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	magic comment test only if encoding_aware?.	Arun Agrawal	2011-08-13	1	-3/+4
\| \| \| \| \|
\| * \| \| \|	Resolve warnings by instantizing @attrubtes as nil	Brian Cardarella	2011-08-13	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	default writing the schema file as utf-8	Aaron Patterson	2011-08-13	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	dump IO encoding value along with schema.rb so the file can be reloaded. ↵	Aaron Patterson	2011-08-13	2	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #1592
\| * \| \| \|	Revert "Merge pull request #2309 from smasry/master"	Jon Leighton	2011-08-13	2	-6/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 9d396ee8195e31f646e0b89158ed96f4db4ab38f, reversing changes made to fa2bfd832c1d1e997d93c2269a485cc74782c86d. Reason: the change broke the build.
\| * \| \| \|	Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697	Samer Masry	2011-08-13	2	-1/+6
\| \| \| \| \|
\| * \| \| \|	Fixed failing query when performing calculation with having based on select.	Dmitriy Kiriyenko	2011-08-13	2	-0/+8
\| \| \| \| \|
\| * \| \| \|	Add a proxy_association method to association proxies, which can be called ↵	Jon Leighton	2011-08-13	4	-6/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	by association extensions to access information about the association. This replaces proxy_owner etc with proxy_association.owner.
\| * \| \| \|	remove deprication warning: ambiguous first argument; put parentheses or ↵	Vishnu Atrai	2011-08-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	even spaces
\| * \| \| \|	remove deprication warning for ruby 1.9.3-head for unused variables	Vishnu Atrai	2011-08-13	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Revert "allow select to have multiple arguments"	Piotr Sarnacki	2011-08-13	2	-11/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 04cc446d178653d362510e79a22db5300d463161. I reverted it because apparently we want to use: select([:a, :b]) instead of select(:a, :b), but there was no tests for that form.
\| * \| \| \|	allow select to have multiple arguments	Sławosz Sławiński	2011-08-13	2	-3/+11
\| \| \| \| \|
\| * \| \| \|	Simplify the test by using id and name. `id` will be the only real sort ↵	Franck Verrot	2011-08-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	criteria in any case as it's unique.
\| * \| \| \|	Revert "Explicitly included hashes in sentence regarding SQL-injection-safe ↵	Xavier Noria	2011-08-13	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	forms" Reason: The hash form is secure, and preferred over the array form if possible. This reverts commit 6dc749596c328c44c80f898d5fa860fff6cab783.