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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #34494 from gmcgibbon/warn_root_conflict	Rafael França	2018-11-20	3	-7/+22
\|\
\| *	Raise an error on root route naming conflicts.	Gannon McGibbon	2018-11-20	3	-7/+22
\|/
*	Merge pull request #33954 from febeling/inconsistent-assignment-has-many-thro...	Aaron Patterson	2018-11-20	4	-3/+43
\|\
\| *	Optimize difference and intersection	Florian Ebeling	2018-11-06	1	-17/+9
\| *	Rename union to intersection	Florian Ebeling	2018-11-06	3	-3/+3
\| *	Fix handling of duplicates for `replace` on has_many-through	Florian Ebeling	2018-11-06	4	-3/+51
* \|	Merge pull request #34492 from alfonsojimenez/fix-typo	Vipul A M	2018-11-20	1	-1/+1
\|\ \
\| * \|	Fix typo in development_dependencies_install.md [ci skip]	Alfonso Jiménez	2018-11-20	1	-1/+1
\|/ /
* \|	Deprecate `event.end = Time.now` in favor of `event.finish!`	Ryuta Kamizono	2018-11-20	1	-2/+6
* \|	Merge pull request #22534 from evopark/master	Rafael Mendonça França	2018-11-19	4	-3/+26
\|\ \
\| * \|	ActionMailer: support overriding template name in multipart	Marcus Ilgner	2015-12-08	4	-3/+26
* \| \|	Merge pull request #20865 from colavitam/only-except-behavior	Rafael Mendonça França	2018-11-19	2	-2/+30
\|\ \ \
\| * \| \|	:only and :except are now chained for routing resource(s)	Michael Colavita	2015-07-13	3	-3/+40
* \| \| \|	Merge pull request #34488 from mullican/word_wrap_preserve_left_side_whitespace	Rafael França	2018-11-19	3	-1/+23
\|\ \ \ \
\| * \| \| \|	Prevent TextHelper#word_wrap from stripping white space on the left	Lyle Mullican	2018-11-19	3	-1/+23
* \| \| \| \|	Merge pull request #34085 from albertoalmagro/display-help-as-command-line-gu...	Rafael França	2018-11-19	2	-34/+35
\|\ \ \ \ \
\| * \| \| \| \|	Homogenize rails help output	Alberto Almagro	2018-11-19	1	-9/+10
\| * \| \| \| \|	Indent guides as rails help command output[ci skip]	Alberto Almagro	2018-11-19	1	-25/+25
* \| \| \| \| \|	Merge pull request #34106 from berniechiu/rails-5-job-serializable-params-class	Rafael Mendonça França	2018-11-19	3	-3/+34
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Permit ActionController::Parameters for serializable Hash	Bernie Chiu	2018-11-19	3	-3/+34
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #34482 from jacobherrington/chore/add-comments-to-templates	Rafael França	2018-11-19	2	-9/+8
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Add comments to markdown templates	jacobherrington	2018-11-18	2	-9/+8
* \| \| \| \| \|	Merge pull request #34453 from bogdanvlviv/exercise-connected_to-and-connects_to	Aaron Patterson	2018-11-19	2	-1/+36
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Exercise `connected_to` and `connects_to` methods	bogdanvlviv	2018-11-15	2	-1/+36
* \| \| \| \| \|	Merge pull request #34486 from tamarr/master	Rafael Mendonça França	2018-11-19	3	-3/+772
\|\ \ \ \ \ \
\| * \| \| \| \| \|	allow right to left styling of docs (#3)	tamarr	2018-11-19	3	-3/+771
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #34410 from gmcgibbon/test_support_windows	Eileen M. Uchitelle	2018-11-19	3	-3/+8
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Windows support for parallelization and instrumenter	Gannon McGibbon	2018-11-08	3	-3/+8
* \| \| \| \| \| \|	Merge pull request #34476 from y-yagi/fix_no_method_error_in_parallelization	Eileen M. Uchitelle	2018-11-19	2	-0/+16
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Correctly handle unknown object in parallel tests	yuuji.yaginuma	2018-11-17	2	-0/+16
* \| \| \| \| \| \| \|	Merge pull request #34483 from iguchi1124/patch-1	Ryuta Kamizono	2018-11-19	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	[ci skip] Update active_job_basics.md	Shota Iguchi	2018-11-19	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #34481 from jacobherrington/patch-1	Gannon McGibbon	2018-11-19	9	-15/+15
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change queueing to queuing in docs and comments [skip ci]	jacobherrington	2018-11-18	9	-15/+15
\|/ / / / / / /
* \| \| \| \| \| \|	Fix test name to match the test behavior	yuuji.yaginuma	2018-11-18	1	-4/+4
* \| \| \| \| \| \|	Remove unused `Journey::Router::RoutingError`	yuuji.yaginuma	2018-11-18	1	-3/+0
* \| \| \| \| \| \|	Merge pull request #34475 from rmacklin/synchronize-actioncable-compiled-bund...	Yuji Yaginuma	2018-11-17	1	-3/+4
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Synchronize ActionCable JS source code with compiled bundle	Richard Macklin	2018-11-16	1	-3/+4
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #34464 from gmcgibbon/re_add_changes_applied_doc	Rafael França	2018-11-16	1	-1/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Re-add changes_applied doc	Gannon McGibbon	2018-11-16	1	-1/+3
* \| \| \| \| \| \|	Merge pull request #34467 from JacobEvelyn/fix-my-typo	Rafael França	2018-11-16	1	-3/+4
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix typo and clarify documentation	Jacob Evelyn	2018-11-16	1	-3/+4
\|/ / / / / / /
* / / / / / /	Fix cache_versioning default note (#34466)	Gannon McGibbon	2018-11-16	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #34363 from tnantoka/docs-cache-key-note-5-2	Gannon McGibbon	2018-11-16	1	-3/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Replace cache_key with cache_key_with_version on caching_with_rails guides [c...	tnantoka	2018-11-16	1	-3/+3
\|/ / / / / /
* \| \| \| \| \|	Arel: Implemented DB-aware NULL-safe comparison (#34451)	Dmytro Shteflyuk	2018-11-15	23	-1/+492
* \| \| \| \| \|	Merge pull request #34457 from NARKOZ/fix-method-call	Ryuta Kamizono	2018-11-15	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix a method call in bin/setup file	Nihad Abbasov	2018-11-15	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #34450 from mtsmfm/add-test	Rafael França	2018-11-14	1	-0/+10
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Add test for normalizing non-unicode string	Fumiaki MATSUSHIMA	2018-11-15	1	-0/+10