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

	Commit message (Expand)	Author	Age	Files	Lines
...
*	Merge pull request #12435 from sikachu/master-port-12084	Aaron Patterson	2013-10-03	2	-1/+10
\|\
\| *	Port test from cf1904f to avoid future regression	Prem Sichanugrist	2013-10-03	2	-1/+10
* \|	map the association chain to table names	Aaron Patterson	2013-10-03	1	-4/+2
\|/
*	Merge pull request #8791 from griffinmyers/master	Rafael Mendonça França	2013-10-03	3	-2/+22
\|\
\| *	DirtyModel uses a hash to keep track of any changes made to attributes	William Myers	2013-05-27	3	-2/+22
* \|	Merge pull request #12431 from GRoguelon/master	Yves Senn	2013-10-03	1	-1/+1
\|\ \
\| * \|	Fix a typo in the code of Testing guide.	Geoffrey Roguelon	2013-10-03	1	-1/+1
\|/ /
* \|	Merge pull request #12430 from vipulnsward/changelog_fix	Yves Senn	2013-10-03	1	-1/+1
\|\ \
\| * \|	`intiantiated` => `instantiated` [ci-skip]	Vipul A M	2013-10-03	1	-1/+1
\|/ /
* \|	fix the variable name	Aaron Patterson	2013-10-02	1	-7/+7
* \|	preheat habtm column cache	Aaron Patterson	2013-10-02	1	-0/+1
* \|	add missing require	Aaron Patterson	2013-10-02	1	-0/+1
* \|	remove some duplicate code	Aaron Patterson	2013-10-02	1	-8/+1
* \|	Merge branch 'master' into habtm	Aaron Patterson	2013-10-02	1	-14/+11
\|\ \
\| * \|	copy-edits the new guide with our maintenance policy [ci skip]	Xavier Noria	2013-10-03	1	-14/+11
* \| \|	add a note to the changelog	Aaron Patterson	2013-10-02	1	-0/+3
* \| \|	remove HABTM associations	Aaron Patterson	2013-10-02	5	-66/+0
* \| \|	remove HABTM special cases from reflections	Aaron Patterson	2013-10-02	1	-14/+2
* \| \|	remove the HABTM preloader	Aaron Patterson	2013-10-02	2	-74/+0
* \| \|	remove HABTM special cases from associations classes	Aaron Patterson	2013-10-02	4	-31/+1
* \| \|	remove HABTM special cases from the fixtures	Aaron Patterson	2013-10-02	1	-12/+0
* \| \|	repurpose the HABTM builder class	Aaron Patterson	2013-10-02	2	-29/+3
* \| \|	goodbye has_and_belongs_to_many1, we will miss you!	Aaron Patterson	2013-10-02	1	-4/+0
* \| \|	keep track of the left and right reflections and expose those	Aaron Patterson	2013-10-02	2	-6/+6
* \| \|	have the builder create the middle reflection	Aaron Patterson	2013-10-02	2	-13/+15
* \| \|	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