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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	fix AR having() not to raise NoMethodError when the given argument does not ↵	Akira Matsuda	2011-07-09	2	-3/+10
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	respond to empty? having raises NoMethodError: undefined method `empty?' when a Fixnum or Date/Time were passed via varargs
* \| \| \| \| \| \|	Foo.joins(:bar).includes(:bar) should result in a single query with :bar as ↵	Jon Leighton	2011-07-09	2	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a join. Related: #1873.
* \| \| \| \| \| \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-07-09	14	-63/+86
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add section about debugging assets	Ryan Bigg	2011-07-09	1	-1/+25
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Clarify that per-controller asset files are not 'magically' loaded by the ↵	Ryan Bigg	2011-07-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	controller, but rather need to be required
\| * \| \| \| \| \| \|	Merge pull request #51 from christopherscott/master	Christopher Scott Hernandez	2011-07-08	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Single word change (find -> where) on active record query page
\| \| * \| \| \| \| \| \|	Updated active_record_querying.textile: intro paragraph of 'Conditions' to ↵	Christopher Scott Hernandez	2011-07-08	1	-1/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	change 'find method' to 'where method'
\| * \| \| \| \| \| \|	update Rails version. (rails console didn't exist in 2.1)	Vijay Dev	2011-07-08	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Changed the value that log_level takes to match the examples in the ↵	Oge Nnadi	2011-07-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	paragraph above
\| * \| \| \| \| \| \|	minor document edit	Akira Matsuda	2011-07-08	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the sample model has only 9 lines: https://github.com/lifo/docrails/commit/4d4819fb279386570466b2f99254cd77fb71e05c#commitcomment-467295
\| * \| \| \| \| \| \|	:conditions => where	Akira Matsuda	2011-07-08	3	-18/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	:joins => joins	Akira Matsuda	2011-07-08	1	-12/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	:include => includes	Akira Matsuda	2011-07-08	1	-7/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	find(:first) => first	Akira Matsuda	2011-07-08	2	-6/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	find(:all) => all	Akira Matsuda	2011-07-08	7	-27/+27
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	document HashWithIndifferentAccess#extractable_options?	Shawn Drost	2011-07-07	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	rails text been added before version	JudeArasu	2011-07-05	1	-4/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove attachment_fu, add CarrierWave to suggested uploader libraries	James Miller	2011-07-05	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2017 from Casecommons/active_record_lint	José Valim	2011-07-08	2	-0/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveRecord::Base subclasses should pass ActiveModel::Lint.
\| * \| \| \| \| \| \| \|	ActiveRecord::Base should pass ActiveModel::Lint.	Grant Hutchins & Peter Jaros	2011-07-08	2	-0/+12
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	config should always be an AS::InheritableOptions object. Closes #1992	Santiago Pastorino	2011-07-08	2	-1/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Destroy association habtm record before destroying the record itself. Fixes ↵	Tomas D'Stefano	2011-07-08	4	-12/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issue #402.
* \| \| \| \| \| \| \| \|	Ensure that the foreign key gets set when doing record.create_association or ↵	Jon Leighton	2011-07-08	2	-2/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	record.create_association. Fixes #1960.
* \| \| \| \| \| \| \| \|	Merge pull request #2012 from dasch/refactor_postgres_adapter	Aaron Patterson	2011-07-08	2	-18/+20
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Refactor PostgreSQLAdapter a bit
\| * \| \| \| \| \| \| \|	Refactor PostgreSQLAdapter a bit	Daniel Schierbeck	2011-07-08	2	-18/+20
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move the private method #extract_schema_and_table into a separate Utils module so that it can be tested without resorting to #send.
* \| \| \| \| \| \| \|	Merge pull request #2010 from hasclass/cache_false_values	Santiago Pastorino	2011-07-08	2	-2/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly cache value when it is "false"
\| * \| \| \| \| \| \| \|	Properly cache value when it is "false"	Sebi Burkhard	2011-07-08	2	-2/+7
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2011 from amatsuda/with_index	Santiago Pastorino	2011-07-08	2	-5/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	replaced some "i += 1" sort of codes with Enumerable#with_index
\| * \| \| \| \| \| \|	Use Enumerable#with_index. We're on Ruby > 1.8.7 (part II)	Akira Matsuda	2011-07-08	1	-3/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use Enumerable#with_index. We're on Ruby > 1.8.7	Akira Matsuda	2011-07-08	1	-2/+1
\|/ / / / / / /
* \| \| \| \| \| \|	use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestion	Xavier Noria	2011-07-08	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	That integer is rather irrelevant, the only thing that matters is that it is consistent and with no apparent bias. Zlib.crc32 is 8-10 times faster than bytes.sum, so use that.
* \| \| \| \| \| \|	Move config.default_asset_host_protocol to the railtie.	José Valim	2011-07-07	2	-6/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Don't raise on mass assignment for test	José Valim	2011-07-07	3	-11/+16
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	removing brittle assertion	Aaron Patterson	2011-07-07	1	-1/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2005 from acroca/master	José Valim	2011-07-07	2	-3/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing asset number for asset_path with %d to be consistent in ruby 1.9
\| * \| \| \| \| \| \|	Using the sum of bytes instead the hash of the path when replacing the ↵	Albert Callarisa Roca	2011-07-08	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wildcard of the assets path because in ruby 1.9 is not consistent
* \| \| \| \| \| \| \|	Merge pull request #1767 from jwarwick/rake_notes_dirs	Santiago Pastorino	2011-07-07	1	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated rake:notes to search additional directories
\| * \| \| \| \| \| \| \|	Updated rake:notes to search app, config, lib, script and test dirs	jwarwick	2011-07-06	1	-4/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1997 from knapo/master	Santiago Pastorino	2011-07-07	2	-2/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make `ActiveRecord::Batches#find_each` to not return `self`.
\| * \| \| \| \| \| \| \| \|	Make `ActiveRecord::Batches#find_each` to not return `self`.	knapo	2011-07-07	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This caused that `find_each` was producing extra db call taking all the records from db, and was less efficient than `ActiveRecord::Base#all`.
* \| \| \| \| \| \| \| \| \|	Merge pull request #1999 from ↵	Xavier Noria	2011-07-07	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dmitriy-kiriyenko/add_require_active_support_delegation_to_relation Add require ActiveSupport delegation to ActiveRecord::Relation class.
\| * \| \| \| \| \| \| \| \|	Add require ActiveSupport delegation to ActiveRecord::Relation class.	Dmitriy Kiriyenko	2011-07-07	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Just generate AR options if AR is enabled	José Valim	2011-07-07	2	-0/+4
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #1996 from bogdan/default_sanitizer_squashed	José Valim	2011-07-07	2	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails app template: setup different mass assignment sanitizer for envs
\| * \| \| \| \| \| \| \| \|	Rails app template: setup different mass assignment sanitizer for envs	Bogdan Gusiev	2011-07-07	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For production - leave the default For test and dev: :strict.
* \| \| \| \| \| \| \| \| \|	Merge pull request #1406 from dmathieu/fix_test_warnings	José Valim	2011-07-07	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Fix test warnings
\| * \| \| \| \| \| \| \| \|	remove the warning when testing whiny_nil	dmathieu	2011-07-07	1	-2/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1120 from lysenko/collection_singular_ids	Santiago Pastorino	2011-07-06	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	collection_singular_ids ignores association :include option
\| * \| \| \| \| \| \| \| \| \|	Fix bug in collection_singular_ids on has many through association with ↵	Anatoliy Lysenko	2011-07-06	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	conditions and includes, when condtions references tables from includes. Test fail because of invalid sql: ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: comments.id: SELECT "posts".id FROM "posts" INNER JOIN "readers" ON "posts"."id" = "readers"."post_id" WHERE "readers"."person_id" = 1 AND (comments.id is null) Bug described in github#925 This commit will revert fix from https://github.com/rails/rails/commit/3436fdfc12d58925e3d981e0afa61084ea34736c , but tests is ok. Bug described in #6569 ticket.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1989 from simonbaird/master	Santiago Pastorino	2011-07-06	1	-5/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rake db:test:purge creates mysql database with wrong charset & collation (master branch)