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

	Commit message (Expand)	Author	Age	Files	Lines
*	[ci skip] Fixed typo	Shailesh Kalamkar	2019-03-23	1	-1/+1
*	Update comment for how secret key is calculated	John Hawthorn	2019-03-22	1	-1/+2
*	Merge pull request #35713 from gmcgibbon/drop_nsec_in_job_argument_assertions	Gannon McGibbon	2019-03-22	3	-0/+73
\|\
\| *	Drop microseconds in job argument assertions	Gannon McGibbon	2019-03-22	3	-0/+73
* \|	Merge pull request #35715 from jhawthorn/changelog_for_cves_6_0	John Hawthorn	2019-03-22	2	-2/+21
\|\ \
\| * \|	Update CHANGELOGs for 6.0.0.beta3 release	John Hawthorn	2019-03-22	2	-2/+21
* \| \|	Merge pull request #35710 from alimi/as-changelog-typo	John Hawthorn	2019-03-22	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Fix AS CHANGELOG typo	Ali Ibrahim	2019-03-22	1	-1/+1
\|/ /
* \|	Merge pull request #35707 from localhostdotdev/fix-rails-guides-generation-in...	Rafael França	2019-03-22	1	-1/+1
\|\ \
\| * \|	Fix rails guides generation	localhostdotdev	2019-03-22	1	-1/+1
* \| \|	Merge pull request #35705 from alimi/instrumenter-block-optional	Eileen M. Uchitelle	2019-03-22	4	-4/+29
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Update instrumentation guides w/optional block	Ali Ibrahim	2019-03-22	1	-0/+11
\| * \|	Update CHANGELOG and docs	Ali Ibrahim	2019-03-22	2	-3/+11
\| * \|	Update AS::Notifications::Instrumenter#instrument	Ali Ibrahim	2019-03-22	2	-1/+7
\|/ /
* \|	Merge pull request #35617 from mattyoho/add-annotation-support-to-relations	Eileen M. Uchitelle	2019-03-22	38	-19/+645
\|\ \
\| * \|	Add Relation#annotate for SQL commenting	Matt Yoho	2019-03-21	38	-19/+645
* \| \|	Merge pull request #35695 from jhawthorn/render_template	Rafael França	2019-03-22	7	-42/+43
\|\ \ \
\| * \| \|	Prefer render template: in tests	John Hawthorn	2019-03-21	7	-42/+43
* \| \| \|	Fix announce script	Rafael Mendonça França	2019-03-22	1	-2/+5
* \| \| \|	Fix release template	Rafael Mendonça França	2019-03-21	1	-2/+2
\| \|/ / \|/\| \|
* \| \|	Fix server restart test on Puma 3.12.1	yuuji.yaginuma	2019-03-22	2	-4/+4
\|/ /
* \|	Fix document formatting of Database configuration classes [ci skip]	yuuji.yaginuma	2019-03-21	3	-35/+35
* \|	Address rubocop offences	Ryuta Kamizono	2019-03-21	2	-9/+9
* \|	Merge pull request #35685 from XrXr/attribute-forwarding	Gannon McGibbon	2019-03-20	2	-0/+24
\|\ \
\| * \|	Document option forwarding in ActiveRecord::Base.attribute	Alan Wu	2019-03-20	2	-0/+24
\| \|/
* \|	Merge pull request #35546 from rails/bulk-inserts-with-index	Kasper Timm Hansen	2019-03-20	3	-139/+165
\|\ \
\| * \|	[ci skip] Documentation pass for insert_all etc.	Kasper Timm Hansen	2019-03-20	1	-105/+107
\| * \|	Bulk Insert: Reuse indexes for unique_by	Kasper Timm Hansen	2019-03-20	3	-64/+88
\| \|/
* \|	Merge pull request #35661 from jhawthorn/lookup_context_validation	Eileen M. Uchitelle	2019-03-20	4	-3/+19
\|\ \ \| \|/ \|/\|
\| *	Don't compact formats	John Hawthorn	2019-03-19	2	-6/+1
\| *	Avoid assigning [nil] to formats	John Hawthorn	2019-03-19	1	-1/+1
\| *	Improve "raises on invalid format assignment" test	John Hawthorn	2019-03-18	1	-2/+2
\| *	Rename invalid_types to invalid_values	John Hawthorn	2019-03-18	1	-3/+3
\| *	Use symbol for mail preview format, not string	John Hawthorn	2019-03-18	1	-1/+1
\| *	Raise in LookupContext#formats= on invalid format	John Hawthorn	2019-03-18	2	-0/+13
\| *	Make uniq in LookupContext#formats=	John Hawthorn	2019-03-18	2	-1/+3
\| *	Ignore nil in LookupContext#formats=	John Hawthorn	2019-03-18	2	-0/+6
* \|	Merge pull request #35677 from bogdanvlviv/mention-process_middleware.action_...	Kasper Timm Hansen	2019-03-20	1	-1/+10
\|\ \
\| * \|	Add mention about `process_middleware.action_dispatch` in the guide [ci skip]	bogdanvlviv	2019-03-20	1	-1/+10
* \| \|	Merge pull request #35679 from y-yagi/make_aliases_of_database_option_work	Yuji Yaginuma	2019-03-20	5	-2/+32
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Make aliases of `database` option in generators work	yuuji.yaginuma	2019-03-20	5	-2/+32
\|/ /
* \|	Merge pull request #35649 from andrehjr/fix-override-of-cookies-controller-specs	Rafael França	2019-03-19	2	-1/+14
\|\ \
\| * \|	Don't override @set_cookies on CookieJar#update_cookies_from_jar'	André Luis Leal Cardoso Junior	2019-03-17	2	-1/+14
* \| \|	Merge pull request #35595 from shioyama/generated_attribute_methods_namespace...	Rafael França	2019-03-19	2	-4/+5
\|\ \ \
\| * \| \|	Give GeneratedAttributeMethods module a name	Chris Salzberg	2019-03-13	2	-4/+5
* \| \| \|	Merge pull request #35675 from larouxn/revert-35656-revert-34277-remove-javas...	Rafael França	2019-03-19	2	-4/+0
\|\ \ \ \
\| * \| \| \|	Revert "Revert "Remove `javascripts` and `javascript_engine` options for gene...	Nicholas La Roux	2019-03-20	2	-4/+0
\|/ / / /
* \| \| \|	Fix test broken by 04ae0b0b5e594e0bb99c5cd608921745977bcdcd	Rafael Mendonça França	2019-03-19	1	-3/+4
* \| \| \|	Merge pull request #35670 from jhawthorn/re_add_template_updated_at	Rafael França	2019-03-19	2	-6/+13
\|\ \ \ \
\| * \| \| \|	Re-add Template#updated_at as deprecated	John Hawthorn	2019-03-19	2	-6/+13
\|/ / / /