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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #9633 from senny/5321_make_it_lazy	Carlos Antonio da Silva	2013-03-09	3	-4/+23
\|\
\| *	Uniqueness validation uses a proc to specify the `:conditions` option.	Yves Senn	2013-03-09	3	-4/+23
* \|	Merge pull request #9618 from manvsmachine/fix-postgres-enable-extension-error	Carlos Antonio da Silva	2013-03-09	1	-1/+1
\|\ \
\| * \|	fixes enable_extension bug in postgresql_adapter	Darren Woodley	2013-03-08	1	-1/+1
* \| \|	Fix "ActiveRecord" => "Active Record" in changelog [ci skip]	Carlos Antonio da Silva	2013-03-09	1	-4/+3
\| \|/ \|/\|
* \|	Merge pull request #9371 from benmoss/access-connection-via-class	Jon Leighton	2013-03-09	7	-13/+19
\|\ \
\| * \|	Deprecate #connection in favour of accessing it via the class	Ben Moss	2013-03-09	7	-13/+19
* \| \|	Merge pull request #9626 from dasch/dasch/instrument-strong-params	José Valim	2013-03-09	2	-1/+7
\|\ \ \
\| * \| \|	Use the instrumentation framework to instrument Strong Params	Daniel Schierbeck	2013-03-07	2	-1/+7
* \| \| \|	Fix race condition in test	Jon Leighton	2013-03-09	1	-2/+2
\| \|/ / \|/\| \|
* \| \|	Merge pull request #9632 from senny/unify_the_changelogs	Carlos Antonio da Silva	2013-03-09	4	-36/+37
\|\ \ \
\| * \| \|	Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip].	Yves Senn	2013-03-09	4	-36/+37
\|/ / /
* \| \|	Merge pull request #9630 from robertjwhitney/update_collection_docs	Carlos Antonio da Silva	2013-03-09	1	-2/+2
\|\ \ \
\| * \| \|	Update documentation for collection<< to reflect << on new records.	Robert Whitney	2013-03-09	1	-2/+2
* \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-03-10	9	-16/+92
\|\ \ \ \
\| * \| \| \|	copy edits [ci skip]	Vijay Dev	2013-03-10	2	-4/+4
\| * \| \| \|	fixed typo in strong parameters example	Yves Senn	2013-03-09	1	-1/+1
\| * \| \| \|	strong parameter example for hashes with integer keys.	Yves Senn	2013-03-09	1	-0/+14
\| * \| \| \|	Adding a note for :body option in `mail` method.	Fabrizio Regini	2013-03-08	1	-0/+13
\| * \| \| \|	fixing typo in the merging scopes section	Neeraj Singh	2013-03-08	1	-4/+3
\| * \| \| \|	Explained how merging of scope works	Neeraj Singh	2013-03-08	1	-0/+56
\| * \| \| \|	Some copy edit and formatting for upgrading guide.	Hendy Tanata	2013-03-08	1	-3/+3
\| * \| \| \|	remove the new metadata note in Rails 4 upgrade guide	Alex Robbin	2013-03-07	1	-6/+0
\| * \| \| \|	fixes active_record_querying #pluck example	awilliams	2013-03-07	1	-1/+1
\| * \| \| \|	Update capture_helper.rb	Jess Brown	2013-03-06	1	-1/+1
\| * \| \| \|	Typppo	Akira Matsuda	2013-03-06	3	-4/+4
* \| \| \| \|	Fix AMo code example indent, add missing author to entry [ci skip]	Carlos Antonio da Silva	2013-03-09	1	-6/+8
* \| \| \| \|	Bump up timeouts	Jon Leighton	2013-03-09	1	-3/+3
* \| \| \| \|	Merge pull request #9629 from wangjohn/numbering_of_applicationrb_is_off	Steve Klabnik	2013-03-09	1	-4/+4
\|\ \ \ \ \
\| * \| \| \| \|	Renumbering the comments in the application boot process.	wangjohn	2013-03-09	1	-4/+4
\|/ / / / /
* \| \| \| \|	Merge pull request #9627 from rubys/master	Carlos Antonio da Silva	2013-03-09	1	-0/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	ensure response.stream is closed	Sam Ruby	2013-03-09	1	-0/+1
\|/ / / /
* \| \| \|	Merge pull request #9621 from sakuro/migration-magic-comment-fix	Jeremy Kemper	2013-03-09	4	-3/+48
\|\ \ \ \
\| * \| \| \|	Preserve magic comments and content encoding of copied migrations.	OZAWA Sakuro	2013-03-09	4	-3/+48
* \| \| \| \|	Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets	Carlos Antonio da Silva	2013-03-09	3	-1/+24
\|\ \ \ \ \
\| * \| \| \| \|	Fix incorrectly appended square brackets to a multiple select box	Olek Janiszewski	2013-03-08	3	-1/+24
* \| \| \| \| \|	Merge pull request #9623 from Agis-/patch-2	Carlos Antonio da Silva	2013-03-09	1	-2/+2
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Remove extra whitespace and fix a comment	Agis Anastasopoulos	2013-03-09	1	-2/+2
\|/ / / / /
* \| \| \| /	Fix failing test regarding console change to fix sandboxing	Carlos Antonio da Silva	2013-03-08	1	-11/+10
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge pull request #8670 from sanemat/fix/rake-desc	Vijay Dev	2013-03-08	1	-0/+2
\|\ \ \ \
\| * \| \| \|	Add rake test description	sanemat	2013-01-01	1	-0/+2
* \| \| \| \|	Merge pull request #9614 from wangjohn/refactoring_nested_associations_for_re...	Rafael Mendonça França	2013-03-08	1	-26/+54
\|\ \ \ \ \
\| * \| \| \| \|	Refactored nested associations so they are more readable. Added comments	wangjohn	2013-03-08	1	-26/+54
\|/ / / / /
* \| \| \| \|	Fix changelog indent, remove self from method call in changelog/doc examples	Carlos Antonio da Silva	2013-03-08	2	-4/+6
* \| \| \| \|	The console --sandbox transaction should not be joinable	Jon Leighton	2013-03-08	2	-11/+10
* \| \| \| \|	Make sure options is a hash	Rafael Mendonça França	2013-03-08	1	-1/+3
* \| \| \| \|	Avoid short-circuit return	Rafael Mendonça França	2013-03-08	1	-5/+9
* \| \| \| \|	Merge pull request #9497 from route/subclass_from_attrs	Rafael Mendonça França	2013-03-08	4	-2/+22
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Fix ActiveRecord `subclass_from_attrs` when eager_load is false.	Dmitry Vorotilin	2013-03-06	4	-2/+22
* \| \| \| \|	Merge pull request #9611 from choudhuryanupam/master	Rafael Mendonça França	2013-03-08	1	-40/+40
\|\ \ \ \ \