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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #13900 from zzak/issue_12963	Carlos Antonio da Silva	2014-01-31	1	-1/+1
\|\
\| *	Document default trim mode for Erubis and affected ERB tags [ci skip]	Zachary Scott	2014-01-31	1	-1/+1
* \|	Merge pull request #13896 from laurocaetano/dangerous_association_names	Carlos Antonio da Silva	2014-01-31	5	-0/+52
\|\ \ \| \|/ \|/\|
\| *	Associations now raise `ArgumentError` on name conflicts.	Lauro Caetano	2014-01-31	5	-0/+52
* \|	Merge pull request #13898 from timfenney/my_branch	Godfrey Chan	2014-01-30	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Remove unused variable.	Tim Fenney	2014-01-31	1	-1/+1
\|/
*	Merge pull request #13859 from huoxito/let-it-go	Rafael Mendonça França	2014-01-30	2	-2/+10
\|\
\| *	Let `unscope` ignore non Arel scope.where_values	Washington Luiz	2014-01-30	2	-2/+10
* \|	Merge pull request #13886 from arthurnn/fix_relation_arel	Rafael Mendonça França	2014-01-30	8	-18/+52
\|\ \
\| * \|	Fix regression on `.select_*` methods.	Arthur Neves	2014-01-30	8	-18/+52
* \| \|	Merge pull request #13612 from eval/issue-13588	Rafael Mendonça França	2014-01-30	4	-16/+230
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Add CreateMigration action	Gert Goet	2014-01-28	4	-16/+230
* \| \|	fix typo and indent. [ci skip]	Yves Senn	2014-01-30	2	-2/+2
* \| \|	Merge pull request #13774 from prathamesh-sonpatki/post-to-article	Yves Senn	2014-01-30	20	-407/+429
\|\ \ \
\| * \| \|	Replace Post with Article in getting started guide [ci skip]	Prathamesh Sonpatki	2014-01-25	20	-407/+429
* \| \| \|	Merge pull request #13884 from rafaelfranca/rm-travel-back	Rafael Mendonça França	2014-01-30	6	-14/+58
\|\ \ \ \
\| * \| \| \|	Improve documentation [ci skip]	Rafael Mendonça França	2014-01-30	2	-5/+7
\| * \| \| \|	Remove automatic removal of Date/Time stubs after each test case	Rafael Mendonça França	2014-01-30	5	-10/+22
\| * \| \| \|	Add `travel_back` to remove stubs from `travel` and `travel_to`	Rafael Mendonça França	2014-01-30	4	-3/+33
\|/ / / /
* \| \| \|	Merge pull request #13878 from marcandre/leave_my_options_alone	Rafael Mendonça França	2014-01-30	2	-2/+8
\|\ \ \ \
\| * \| \| \|	find_in_batches should not mutate its argument	Marc-Andre Lafortune	2014-01-29	2	-2/+8
* \| \| \| \|	tidy CHANGELOGs [ci skip]	Yves Senn	2014-01-30	5	-18/+25
* \| \| \| \|	docs, `references` is only used with `includes`. Closes #13727.	Yves Senn	2014-01-30	1	-9/+14
* \| \| \| \|	Merge pull request #13888 from rails/session-serializer	Godfrey Chan	2014-01-30	6	-32/+23
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Modify the session serializer implementation	Guillermo Iguaran	2014-01-30	6	-32/+23
\|/ / / /
* \| \| \|	Merge pull request #13883 from rafaelfranca/rm-time-travel	Rafael Mendonça França	2014-01-29	1	-4/+53
\|\ \ \ \
\| * \| \| \|	Use each_value	Rafael Mendonça França	2014-01-29	1	-1/+1
\| * \| \| \|	Store the singleton_class in a local variable	Rafael Mendonça França	2014-01-29	1	-3/+4
\| * \| \| \|	Change the class and method visibility	Rafael Mendonça França	2014-01-29	1	-9/+13
\| * \| \| \|	Use instance method instead of before hook	Rafael Mendonça França	2014-01-29	1	-9/+8
\| * \| \| \|	Alias the original method first to avoid warnings	Rafael Mendonça França	2014-01-29	1	-2/+7
\| * \| \| \|	Implement a simple stub feature to use in the Time travel helpers	Rafael Mendonça França	2014-01-29	1	-4/+44
\|/ / / /
* \| \| \|	Merge pull request #13879 from schneems/schneems/more-explicit-database-confi...	Rafael Mendonça França	2014-01-29	1	-0/+2
\|\ \ \ \
\| * \| \| \|	Enhance errors while retrieving database config	schneems	2014-01-29	1	-0/+2
* \| \| \| \|	Aesthetic	Rafael Mendonça França	2014-01-29	3	-13/+13
* \| \| \| \|	Merge pull request #13867 from mauricio/bug-13861	Rafael Mendonça França	2014-01-29	5	-1/+52
\|\ \ \ \ \
\| * \| \| \| \|	Fixing issue with activerecord serialization not being able to dump a record ...	Mauricio Linhares	2014-01-29	5	-1/+52
* \| \| \| \| \|	Merge pull request #13876 from sowjumn/master	Rafael Mendonça França	2014-01-29	1	-10/+5
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Added some style changes in asset pipeline documentation	sowjanya	2014-01-29	1	-10/+5
* \| \| \| \| \|	Merge pull request #13871 from kassio/fix-filters-with-classes-documentation	Robin Dupret	2014-01-29	3	-2/+12
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix documentation of new controller filters api [ci skip]	Kassio Borges	2014-01-29	3	-2/+12
\|/ / / / /
* \| \| \| \|	Merge pull request #13201 from marcandre/find_in_batch_enumerator	Rafael Mendonça França	2014-01-29	3	-0/+27
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	`find_in_batches` now returns an `Enumerator` when called without a block, so...	Marc-Andre Lafortune	2013-12-06	3	-0/+27
* \| \| \| \|	Merge pull request #13877 from marcandre/find_in_batches	Rafael Mendonça França	2014-01-29	1	-0/+2
\|\ \ \ \ \
\| * \| \| \| \|	Mention find_each in find_in_batches doc [ci skip]	Marc-Andre Lafortune	2014-01-29	1	-0/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #13450 from chancancode/ar_raise_on_conflict	Godfrey Chan	2014-01-29	8	-9/+219
\|\ \ \ \ \
\| * \| \| \| \|	`enum` now raises on "dangerous" name conflicts	Godfrey Chan	2014-01-29	3	-3/+113
\| * \| \| \| \|	`scope` now raises on "dangerous" name conflicts	Godfrey Chan	2014-01-29	4	-4/+95
\| * \| \| \| \|	Fixed a bug in AR::Base#respond_to?	Godfrey Chan	2014-01-29	2	-2/+11
\|/ / / / /
* \| \| \| \|	Update CHANGELOG properly with GH #13692 [ci-skip]	Guillermo Iguaran	2014-01-29	1	-14/+14