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

	Commit message (Expand)	Author	Age	Files	Lines
*	call the class method to define the callbacks	Aaron Patterson	2013-10-02	1	-1/+1
*	Merge branch 'master' into habtm	Aaron Patterson	2013-10-02	15	-61/+150
\|\
\| *	we can define callbacks without a builder instance	Aaron Patterson	2013-10-02	4	-9/+9
\| *	push methods that don't depend on the instance to the class	Aaron Patterson	2013-10-02	2	-6/+6
\| *	get the name from the reflection	Aaron Patterson	2013-10-02	1	-1/+1
\| *	cache the name and options on the stack	Aaron Patterson	2013-10-02	1	-1/+3
\| *	decouple belongs_to callback definition from the builder instance.	Aaron Patterson	2013-10-02	1	-4/+4
\| *	add_before_destroy_callbacks doesn't depend on the instance, so push it	Aaron Patterson	2013-10-02	2	-5/+5
\| *	valid_options doesn't depend on the instance, so push it to the class	Aaron Patterson	2013-10-02	4	-8/+8
\| *	use the information on the reflection to determine whether callbacks should b...	Aaron Patterson	2013-10-02	1	-4/+5
\| *	Merge pull request #12171 from matiaskorhonen/adds-maintenance-policy-to-guides	Xavier Noria	2013-10-02	3	-0/+70
\| \|\
\| \| *	Adds the Rails maintenance policy to the Guides	Matias Korhonen	2013-10-03	3	-0/+70
\| * \|	Merge pull request #12428 from arunagw/running_isolated_test_av	Rafael Mendonça França	2013-10-02	1	-1/+1
\| \|\ \
\| \| * \|	Running all isolated test for actionview	Arun Agrawal	2013-10-03	1	-1/+1
\| \|/ /
\| * \|	association builder is no longer needed for counter cache, so remove it	Aaron Patterson	2013-10-02	1	-7/+6
\| * \|	push constructable? on to the reflection	Aaron Patterson	2013-10-02	5	-18/+22
\| * \|	name is on the reflection, so just use the reflection	Aaron Patterson	2013-10-02	1	-2/+2
\| * \|	decouple define_callback from the instance	Aaron Patterson	2013-10-02	1	-2/+4
\| \|/
\| *	Merge pull request #12426 from arunagw/added_activemodel_in_railsgemspec	Guillermo Iguaran	2013-10-02	1	-0/+1
\| \|\
\| \| *	Added activemodel as a explicit dependency	Arun Agrawal	2013-10-02	1	-0/+1
\| \|/
\| *	unify `Fixes` notes in AR changelog. [ci skip].	Yves Senn	2013-10-02	1	-7/+7
\| *	improving `reload` doc wording. #12418 [ci skip]	Yves Senn	2013-10-02	1	-1/+2
\| *	Merge pull request #12418 from makaroni4/fix/ar_reload_doc_12101	Yves Senn	2013-10-01	1	-2/+11
\| \|\
\| \| *	Update AR reload doc for the case of manually set primary key attribute [ci s...	Anatoli Makarevich	2013-10-02	1	-2/+11
* \| \|	move habtm translation to a builder class	Aaron Patterson	2013-10-02	2	-89/+116
* \| \|	get the left and right association names from the join model	Aaron Patterson	2013-10-02	1	-8/+17
* \| \|	define the join model without using closures on the methods	Aaron Patterson	2013-10-02	1	-18/+31
* \| \|	decouple the HABTM builder	Aaron Patterson	2013-10-01	1	-2/+31
* \| \|	only pass options to the habtm builder	Aaron Patterson	2013-10-01	1	-1/+1
* \| \|	Squashed commit of the following:	Aaron Patterson	2013-10-01	7	-19/+109
\|/ /
* \|	Merge pull request #12416 from sepastian/guides_configuring_initialization_hooks	Yves Senn	2013-10-01	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	guides: configuring: fixing explanation of :after_initialize hook	Sebastian Gassner	2013-10-01	1	-1/+1
\|/
*	revises the docs of require_dependency [ci skip]	Xavier Noria	2013-10-01	1	-1/+9
*	registers 0b0beb7 in the CHANGELOG [ci skip]	Xavier Noria	2013-10-01	1	-0/+5
*	Merge pull request #12412 from bf4/allow_pathname_for_require_dependency	Xavier Noria	2013-09-30	2	-1/+14
\|\
\| *	require_dependency should allow Pathname-like objects, not just String	Benjamin Fleischer	2013-09-30	2	-1/+14
* \|	extract adapter savepoint implementations into `abstract/savepoints.rb`.	Yves Senn	2013-09-30	6	-46/+27
* \|	change the savepoint interface to allow passing the name.	Yves Senn	2013-09-30	6	-21/+56
* \|	Merge pull request #12407 from senny/extract_next_migration_number_into_module	Yves Senn	2013-09-30	3	-8/+24
\|\ \
\| * \|	Make `.next_migration_number` reusable for third party AR generators.	Yves Senn	2013-09-30	3	-8/+24
\|/ /
* \|	Add changlog entry for #10844	Andrew White	2013-09-30	1	-0/+7
* \|	Merge branch 'fix-ip-spoof-errors' of https://github.com/tamird/rails into ta...	Andrew White	2013-09-30	2	-1/+11
\|\ \
\| * \|	make sure both headers are set before checking for ip spoofing	Tamir Duberstein	2013-06-04	2	-1/+11
* \| \|	fix `test_sqlite3_mem` test run.	Yves Senn	2013-09-30	1	-0/+1
* \| \|	Merge pull request #12383 from marclennox/master	Rafael Mendonça França	2013-09-29	2	-2/+11
\|\ \ \
\| * \| \|	Fixed issue #12327	Marc Lennox	2013-09-27	2	-2/+11
* \| \| \|	Merge pull request #12400 from jaredbeck/fixes_guide_re_action_on_unpermitted...	Rafael Mendonça França	2013-09-28	1	-1/+1
\|\ \ \ \
\| * \| \| \|	fixes incorrect spelling of `action_on_unpermitted_parameters`	Jared Beck	2013-09-28	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #12354 from kennyj/fix_12293	Rafael Mendonça França	2013-09-28	3	-1/+26
\|\ \ \ \
\| * \| \| \|	Strong parameters should permit nested number as key. Closes #12293	kennyj	2013-09-27	3	-1/+26