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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #19501 from ccutrer/dry_sti_subclass_finding2	Sean Griffin	2015-10-29	6	-23/+30
\|\
\| *	Fix a stylistic nitpick in #19501	Sean Griffin	2015-10-29	1	-3/+3
\| *	Fix test failures caused by #19501	Sean Griffin	2015-10-29	3	-1/+3
\| *	Fix merge conflicts from #19501	Sean Griffin	2015-10-29	4	-23/+28
\| \|\
\| \| *	DRY up STI subclass logic	Cody Cutrer	2015-03-24	4	-22/+29
* \| \|	Merge pull request #22026 from akihiro17/fix-preload-association	Yves Senn	2015-10-29	3	-0/+28
\|\ \ \
\| * \| \|	Set `scope.reordering_value` to `true` if :reordering values are specified	akihiro17	2015-10-30	3	-0/+28
\| \|/ /
* \| \|	Merge pull request #22116 from gsamokovarov/fix-form-for-block-test	Yves Senn	2015-10-29	1	-2/+3
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix a faulty form_for test	Genadi Samokovarov	2015-10-29	1	-2/+3
* \| \|	tests, no every adapter supports "connection.version"	Yves Senn	2015-10-29	2	-22/+24
* \| \|	Merge pull request #22114 from oesgalha/docs_use_distinct	Zachary Scott	2015-10-29	2	-5/+5
\|\ \ \
\| * \| \|	Use #distinct instead of #uniq in the guides [ci skip]	oesgalha	2015-10-29	2	-5/+5
\|/ / /
* \| \|	Ignore scope in missing translation input.	Kasper Timm Hansen	2015-10-28	2	-1/+9
* \| \|	Merge pull request #21998 from kddeisz/rake_task_statistics	Arthur Nogueira Neves	2015-10-28	5	-1/+23
\|\ \ \
\| * \| \|	Allow rake:stats to account for rake tasks	Kevin Deisz	2015-10-19	5	-1/+23
* \| \| \|	Merge pull request #18548 from sebjacobs/support-bidirectional-destroy-depend...	Sean Griffin	2015-10-28	7	-0/+116
\|\ \ \ \
\| * \| \| \|	Add support for bidirectional destroy dependencies	Seb Jacobs	2015-01-16	7	-1/+119
* \| \| \| \|	Merge pull request #22073 from arunagw/remove-require-sdoc-rakefile	Arthur Nogueira Neves	2015-10-28	1	-1/+0
\|\ \ \ \ \
\| * \| \| \| \|	Remove required `sdoc` from Rakefile	Arun Agrawal	2015-10-26	1	-1/+0
* \| \| \| \| \|	Merge pull request #22099 from yui-knk/doc_as_instrumentation	Arthur Nogueira Neves	2015-10-28	1	-0/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	[ci skip] Add `:binds` to a list of paramaters of `sql.active_record`	yui-knk	2015-10-28	1	-0/+1
* \| \| \| \| \| \|	Merge pull request #22096 from Gaurav2728/change_deprecated_msg	Richard Schneeman	2015-10-28	2	-6/+6
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	specify deprecated waring, follow the standard conventions	Gaurav Sharma	2015-10-28	2	-6/+6
\|/ / / / / /
* \| \| \| \| \|	Write the cookie jar it was not committed in TestCase	Rafael Mendonça França	2015-10-28	2	-2/+2
* \| \| \| \| \|	Remove dead code	Rafael Mendonça França	2015-10-28	1	-5/+0
* \| \| \| \| \|	Merge pull request #22095 from ajmyers01/fix_typo_in_eager_load_polymorphic_e...	Rafael França	2015-10-27	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix Typo in EagerLoadPolymorphicError [ci skip]	Alex Myers	2015-10-27	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #18383 from scambra/habtm-with-where-includes-16032-for-ma...	Rafael Mendonça França	2015-10-27	3	-1/+40
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Includes HABTM returns correct size now. It's caused by the join dependency	Sergio Cambra	2015-01-07	3	-2/+41
* \| \| \| \| \| \|	Merge pull request #22093 from y-yagi/fix_typo_in_db_purge	Rafael França	2015-10-27	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	fix typo in `db:purge` description [ci skip]	yuuji.yaginuma	2015-10-28	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #22087 from yui-knk/fix_ar_changelog	Kasper Timm Hansen	2015-10-27	1	-17/+14
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] Aline code examples in AR changelog	yui-knk	2015-10-27	1	-17/+14
* \| \| \| \| \| \| \|	Merge pull request #22078 from arunagw/secret-key-as-an-integer	Santiago Pastorino	2015-10-27	2	-0/+16
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	raise `ArgumentError` when `SECRET_KEY_BASE` is an integer	Arun Agrawal	2015-10-27	2	-0/+16
\|/ / / / / / /
* \| \| \| \| \| \|	Remove skipped JRuby tests that are passing on 9.0.3.0.	Guo Xiang Tan	2015-10-27	3	-6/+0
* \| \| \| \| \| \|	Revert "Merge pull request #21994 from mtodd/inherit-scopes"	Rafael Mendonça França	2015-10-27	2	-3/+3
* \| \| \| \| \| \|	Merge pull request #21994 from mtodd/inherit-scopes	Arthur Neves	2015-10-26	2	-3/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Make inherited scope test fail	Matt Todd	2015-10-26	2	-3/+3
\|/ / / / / / /
* \| \| \| \| \| \|	[ci skip] Add doc for preloader_for	schneems	2015-10-26	1	-0/+4
* \| \| \| \| \| \|	[ci skip] Clarify doc for preloaders_for_one	schneems	2015-10-26	1	-0/+5
* \| \| \| \| \| \|	[ci skip] Add doc to preloaders_on	schneems	2015-10-26	1	-0/+1
* \| \| \| \| \| \|	Merge pull request #19686 from tsun1215/index_errors	Sean Griffin	2015-10-26	8	-4/+95
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Errors can be indexed with nested attributes	Michael Probber	2015-04-17	8	-4/+95
* \| \| \| \| \| \| \|	Merge pull request #22080 from AnnaErshova/edits-config-code-text	Rafael França	2015-10-26	1	-2/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Edits default `config/boot.rb` to match what's generated by Rails 4.2.	AnnaErshova	2015-10-26	1	-2/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #19924 from iamvery/db-tasks-exit-status	Sean Griffin	2015-10-26	6	-5/+67
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Update changelog with db rake task exit status fix	Jay Hayes	2015-10-20	1	-0/+4
\| * \| \| \| \| \| \| \|	Exit with non-zero status when db:drop fails	Jay Hayes	2015-10-20	2	-1/+12
\| * \| \| \| \| \| \| \|	Exit with non-zero status when db:create fails	Jay Hayes	2015-10-20	4	-3/+21