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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #5480 from drogus/rendering-issues	José Valim	2012-03-17	8	-0/+46
*	Merge pull request #5321 from pfeiffer/uniqueness_validator_conditions	José Valim	2012-03-17	2	-2/+30
\|\
\| *	Correct grammar in documentation	Mattias Pfeiffer	2012-03-07	1	-1/+1
\| *	Change syntax to accept an AR::Relation instead of old conditions hash/array.	Mattias Pfeiffer	2012-03-07	2	-4/+10
\| *	Add :conditions option to uniqueness validator	Mattias Pfeiffer	2012-03-07	2	-2/+24
* \|	Merge pull request #5487 from kennyj/should_use_argument	José Valim	2012-03-17	1	-1/+1
\|\ \
\| * \|	Should use an argument in http_digest_authentication_test.rb	kennyj	2012-03-17	1	-1/+1
\|/ /
* \|	Merge pull request #5470 from sandeepravi/warning_fixes	José Valim	2012-03-17	1	-0/+5
\|\ \
\| * \|	fixed - warning: instance variable @controller not initialized	Sandeep	2012-03-16	1	-0/+5
* \| \|	Merge pull request #5483 from luke-gru/gemfile_change	José Valim	2012-03-17	1	-1/+1
\|\ \ \
\| * \| \|	switch rack-test in Gemfile to using git protocol	Luke Gruber	2012-03-16	1	-1/+1
* \| \| \|	Merge pull request #5484 from luke-gru/consistent_module_naming	Xavier Noria	2012-03-16	3	-6/+6
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	use consistent explicit module inclusion	Luke Gruber	2012-03-16	3	-6/+6
\|/ / /
* \| \|	Merge pull request #5475 from rafaelfranca/fix-build	Piotr Sarnacki	2012-03-16	1	-12/+15
\|\ \ \
\| * \| \|	Fix ActiveRecord::Relation#blank? tests	Rafael Mendonça França	2012-03-16	1	-12/+15
\|/ / /
* \| \|	use empty? on the hash to avoid another method call	Aaron Patterson	2012-03-16	1	-1/+1
* \| \|	removed unnecessary calls to "freeze"	Aaron Patterson	2012-03-16	1	-2/+1
* \| \|	remove some mocha stubs	Aaron Patterson	2012-03-16	1	-6/+11
* \| \|	make stubbing Time.now easier	Aaron Patterson	2012-03-16	1	-1/+7
* \| \|	Merge pull request #5469 from yakko/master	José Valim	2012-03-16	1	-0/+19
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	test relation presence fix	Thiago Almeida	2012-03-16	1	-4/+4
\| * \|	tests for Relation .present? and .blank? are check cases and shouldn't force ...	Thiago Almeida	2012-03-16	1	-0/+19
* \| \|	Merge pull request #5468 from sandeepravi/warning_fixes	Santiago Pastorino	2012-03-16	1	-1/+1
\|\ \ \
\| * \| \|	fixed - warning: ambiguous first argument; put parentheses or even spaces	Sandeep	2012-03-16	1	-1/+1
\|/ / /
* \| \|	Speed up mass assignment by avoiding extra loops.	José Valim	2012-03-16	1	-7/+5
* \| \|	Merge pull request #5467 from bogdan/initialize_callbacks	José Valim	2012-03-16	1	-1/+1
\|\ \ \
\| * \| \|	ActiveRecord::Core#initialize: improve performance	Bogdan Gusiev	2012-03-15	1	-1/+1
* \| \| \|	Merge pull request #5466 from carlosantoniodasilva/as-review	José Valim	2012-03-16	9	-71/+36
\|\ \ \ \
\| * \| \| \|	Remove deprecation from AS::Deprecation behavior, some minor cleanups	Carlos Antonio da Silva	2012-03-16	9	-71/+36
\|/ / / /
* \| \| \|	Merge pull request #5465 from sandeepravi/warning_fixes	José Valim	2012-03-16	1	-1/+1
\|\ \ \ \
\| * \| \| \|	fixed - warning: assigned but unused variable - checker	Sandeep	2012-03-16	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgs	Piotr Sarnacki	2012-03-16	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Fix exceptions messages in AC layouts	Alexey Vakhov	2012-03-10	1	-2/+2
* \| \| \| \|	Merge pull request #5461 from yakko/master	José Valim	2012-03-16	1	-0/+4
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	relation .present? and .blank? should not query SELECT COUNT(DISTINCT id)	Thiago Almeida	2012-03-16	1	-0/+4
* \| \| \| \|	Merge pull request #5327 from kennyj/fix_explicitly_inheraitance_column	Aaron Patterson	2012-03-15	2	-1/+12
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Don't reset inheritance_column when setting explicitly.	kennyj	2012-03-08	2	-1/+12
* \| \| \| \|	Merge pull request #5454 from luke-gru/luke-dev	Piotr Sarnacki	2012-03-15	2	-4/+44
\|\ \ \ \ \
\| * \| \| \| \|	allow zero-arity proc for AbstrController::layout	Luke Gruber	2012-03-15	2	-4/+44
* \| \| \| \| \|	Merge pull request #5457 from brianmario/typo-fix	Aaron Patterson	2012-03-15	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	fix typo in redirect test	Brian Lopez	2012-03-15	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5456 from brianmario/redirect-sanitization	Aaron Patterson	2012-03-15	3	-2/+22
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	strip null bytes from Location header as well	Brian Lopez	2012-03-15	3	-2/+22
\|/ / / / /
* \| \| \| \|	errors should probably be logged as errors	Aaron Patterson	2012-03-15	1	-20/+19
* \| \| \| \|	Merge pull request #5451 from yahonda/address_hstores_failue	Aaron Patterson	2012-03-15	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Address the dump file format for hstore	Yasuo Honda	2012-03-15	1	-1/+1
\|/ / / / /
* \| \| \| \|	Revert "AM::MassAssingmentSecurity: improve performance"	José Valim	2012-03-15	2	-17/+19
* \| \| \| \|	Merge pull request #5437 from kennyj/fix_5430	Aaron Patterson	2012-03-15	2	-1/+8
\|\ \ \ \ \
\| * \| \| \| \|	Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.	kennyj	2012-03-15	2	-1/+8
* \| \| \| \| \|	Merge pull request #5337 from mreinsch/static_invalid_byte_sequence	Aaron Patterson	2012-03-15	2	-0/+5
\|\ \ \ \ \ \