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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #8302 from roberto/assert_template_empty_string	Carlos Antonio da Silva	2012-11-25	3	-1/+19
\|\
\| *	`assert_template` fails with empty string.	Roberto Soares	2012-11-23	3	-9/+12
\| *	`assert_template` fails with empty string when a template has been rendered	Roberto Soares	2012-11-23	3	-4/+19
* \|	Merge pull request #8311 from alisdair/dirty-nullable-datetime	Carlos Antonio da Silva	2012-11-25	3	-0/+21
\|\ \
\| * \|	Don't call will_change! for datetime nil->"".	Alisdair McDiarmid	2012-11-25	3	-0/+21
\|/ /
* \|	Merge pull request #8306 from senny/documentation_for_hidden_field_id	Carlos Antonio da Silva	2012-11-24	1	-0/+5
\|\ \
\| * \|	document :hidden_field_id option for fields_for	Yves Senn	2012-11-24	1	-0/+5
* \| \|	Fix changelog entry about fast_string_to_time fix	Carlos Antonio da Silva	2012-11-24	1	-2/+2
* \| \|	Refector a bit to remove extra slice iteration and splat call	Carlos Antonio da Silva	2012-11-24	1	-2/+2
* \| \|	Use merge! in some places to avoid creating extra hashes	Carlos Antonio da Silva	2012-11-24	2	-4/+4
* \| \|	Simplify scope options recovery by using merge!	Carlos Antonio da Silva	2012-11-24	1	-6/+1
* \| \|	Normalize scope recovering :blocks option name	Carlos Antonio da Silva	2012-11-24	1	-3/+3
* \| \|	Simplify constraints condition in scope when checking for Hash	Carlos Antonio da Silva	2012-11-24	1	-7/+4
* \| \|	Move initialize_copy method around to let new method / build alias closer	Carlos Antonio da Silva	2012-11-24	1	-8/+8
\| \|/ \|/\|
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-11-23	3	-4/+4
\|\ \
\| * \|	fixed a minor spelling error	Lennart Tange	2012-11-20	1	-1/+1
\| * \|	embed code example using backticks in caching guide	Sergey Nartimov	2012-11-20	1	-2/+2
\| * \|	remove previous commit	Michel Grootjans	2012-11-20	1	-1/+1
\| * \|	bug in example '<%= form_for ...' should be '<% form_for ...'	Michel Grootjans	2012-11-20	1	-1/+1
\| * \|	Fix broken link in Active Record Query Interface guide	Jaime Iniesta	2012-11-18	1	-1/+1
* \| \|	Merge pull request #8291 from senny/8265_build_with_polymorphic_association	Rafael Mendonça França	2012-11-22	3	-1/+15
\|\ \ \
\| * \| \|	prevent mass assignment of polymorphic type when using `build`	Yves Senn	2012-11-22	3	-1/+15
* \| \| \|	Indent changelog markdown code to highlight correctly	Carlos Antonio da Silva	2012-11-22	1	-11/+11
* \| \| \|	Merge pull request #8114 from guilleiguaran/use-symbols-in-scope	Andrew White	2012-11-22	3	-1/+43
\|\ \ \ \
\| * \| \| \|	Allow setting a symbol as path in scope on routes	Guillermo Iguaran	2012-11-21	3	-1/+43
\|/ / / /
* \| \| \|	Remove private partial/template renderer methods	Carlos Antonio da Silva	2012-11-21	3	-14/+3
* \| \| \|	Merge branch 'deprecate-calculations-with-block'	Carlos Antonio da Silva	2012-11-21	6	-49/+25
\|\ \ \ \
\| * \| \| \|	Remove the #sum method from CollectionAssociation	Carlos Antonio da Silva	2012-11-21	1	-9/+0
\| * \| \| \|	Deprecate Relation#sum with a block.	Carlos Antonio da Silva	2012-11-21	5	-3/+22
\| * \| \| \|	Revert "Yield only one argument instead of splatting."	Carlos Antonio da Silva	2012-11-21	3	-37/+3
\|/ / / /
* \| \| \|	Don't allocate new strings in compiled attribute methods	Jon Leighton	2012-11-21	3	-21/+38
* \| \| \|	Move migration test together with other join table tests	Carlos Antonio da Silva	2012-11-21	2	-7/+6
* \| \| \|	Use secure password min cost option in its own tests for a speed up	Carlos Antonio da Silva	2012-11-21	1	-2/+10
\|/ / /
* \| \|	Merge pull request #8183 from jcoglan/objectless_sessions	Jon Leighton	2012-11-21	3	-11/+47
\|\ \ \
\| * \| \|	Store FlashHashes in the session as plain hashes rather than custom objects w...	James Coglan	2012-11-09	3	-11/+47
* \| \| \|	Merge pull request #7716 from steveklabnik/issue_7715	Rafael Mendonça França	2012-11-21	2	-1/+8
\|\ \ \ \
\| * \| \| \|	Coerce strings in create_join_table.	Steve Klabnik	2012-11-21	2	-1/+8
* \| \| \| \|	Merge pull request #8290 from cpatuzzo/master	Carlos Antonio da Silva	2012-11-21	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Typo	Chris Patuzzo	2012-11-21	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #6245 from bogdan/bc_timestamp	Rafael Mendonça França	2012-11-21	4	-3/+24
\|\ \ \ \ \
\| * \| \| \| \|	Fix postgresql adapter to handle bc timestamps correctly	Bogdan Gusiev	2012-11-21	4	-3/+24
* \| \| \| \| \|	Merge pull request #8289 from semaperepelitsa/pg_adapter_refactoring_squashed	Rafael Mendonça França	2012-11-21	2	-13/+39
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Refactoring, testing and documenting pg_connection.distinct	Semyon Perepelitsa	2012-11-21	2	-13/+39
\|/ / / / /
* \| \| \| \|	Remove return guard and use code convetions	Rafael Mendonça França	2012-11-20	1	-7/+11
* \| \| \| \|	Merge pull request #8280 from asanghi/fix_guide_field_with_error_proc	Rafael Mendonça França	2012-11-20	1	-2/+6
\|\ \ \ \ \
\| * \| \| \| \|	fix guide with field_with_error proc example	Aditya Sanghi	2012-11-20	1	-2/+6
* \| \| \| \| \|	Merge pull request #8282 from arunagw/warning_removed_for_ruby2	Carlos Antonio da Silva	2012-11-20	1	-0/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Initialize accessors to remove some warnings in Ruby 2.0	Arun Agrawal	2012-11-21	1	-0/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #8276 from pwnall/pgsql_text_limits	Rafael Mendonça França	2012-11-20	4	-0/+35
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Postgresql doesn't accepts limits on text columns.	Victor Costan	2012-11-20	4	-0/+35
\|/ / / / /