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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #32650 from bogdanvlviv/return_back_slash_and_use___dir__	Rafael França	2018-04-19	2	-2/+2
\|\
\| *	Return back "/" to the end of RAILS_GEM_ROOT	bogdanvlviv	2018-04-20	2	-2/+2
* \|	Merge pull request #32574 from DmytroVasin/rails-ujs-stoppable-events	Rafael França	2018-04-19	9	-64/+73
\|\ \
\| * \|	Fix stoppable events in tests and docs.	Dmytro Vasin	2018-04-14	9	-64/+73
* \| \|	Revert "Merge pull request #32652 from bogdanvlviv/add-missing-changelog-for-...	Rafael Mendonça França	2018-04-19	1	-12/+0
* \| \|	Merge pull request #32649 from rails/universal-ruby-version	Guillermo Iguaran	2018-04-19	2	-2/+2
\|\ \ \
\| * \| \|	Create a .ruby-version compatible with MRI/JRuby by default	Guillermo Iguaran	2018-04-19	2	-2/+2
\| \| \|/ \| \|/\|
* \| \|	Don't expose `Relation#preload_associations` in the doc	Ryuta Kamizono	2018-04-20	1	-1/+1
* \| \|	Merge pull request #32654 from yahonda/suppress_ambiguous_first_argument_at_d...	Ryuta Kamizono	2018-04-20	1	-1/+1
\|\ \ \
\| * \| \|	Use assert_no_match for test_order_to_unscope_reordering	Yasuo Honda	2018-04-20	1	-1/+1
* \| \| \|	Merge pull request #32652 from bogdanvlviv/add-missing-changelog-for-32593	Ryuta Kamizono	2018-04-20	1	-0/+12
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Add missing changelog entry	bogdanvlviv	2018-04-20	1	-0/+12
\| \|/ /
* \| \|	Merge pull request #32645 from maneframe/skip_query_cache_merge	Rafael Mendonça França	2018-04-19	2	-2/+6
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix relation merging with skip_query_cache!	James Williams	2018-04-19	3	-3/+11
* \| \|	Merge pull request #32648 from bogdanvlviv/improve-pattern-filenames-to-catch...	Rafael França	2018-04-19	6	-13/+13
\|\ \ \
\| * \| \|	Allow rubocop check more files	bogdanvlviv	2018-04-19	6	-13/+13
* \| \| \|	Merge pull request #32168 from christianblais/activesupport-ordinalize-i18n	Rafael França	2018-04-19	4	-13/+59
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	`ActiveSupport::Inflector#ordinal` and `ActiveSupport::Inflector#ordinalize`	Christian Blais	2018-03-05	4	-13/+59
* \| \| \|	Merge pull request #32401 from yhirano55/improve_css_in_guide	Rafael França	2018-04-19	2	-12/+2
\|\ \ \ \
\| * \| \| \|	Improve css in guide	Yoshiyuki Hirano	2018-04-01	2	-12/+2
* \| \| \| \|	Merge pull request #32636 from yhirano55/improve_line_tasks	Rafael França	2018-04-19	2	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Improve redundancy in line tasks	Yoshiyuki Hirano	2018-04-19	2	-2/+2
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	[ci skip] Restore of links in RDOC_MAIN after an update of the file (#32644)	Felipe Tovar	2018-04-19	1	-11/+11
* \| \| \| \|	Merge pull request #32593 from sdhull/fix-strong-params-permit-bang	Rafael Mendonça França	2018-04-19	2	-2/+5
\|\ \ \ \ \
\| * \| \| \| \|	Fixes StrongParameters permit! to work with nested arrays	Steve Hull	2018-04-16	3	-2/+12
* \| \| \| \| \|	Merge pull request #32605 from composerinteralia/assert-not	Rafael França	2018-04-19	104	-338/+429
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Replace `assert !` with `assert_not`	Daniel Colson	2018-04-19	98	-328/+328
\| * \| \| \| \| \|	Add RuboCop for `assert_not` over `assert !`	Daniel Colson	2018-04-19	6	-10/+101
* \| \| \| \| \| \|	Merge pull request #32637 from yhirano55/add_exclude_condition_in_rubocop	Rafael França	2018-04-19	1	-0/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add exculude condition in rubocop.yml	Yoshiyuki Hirano	2018-04-20	1	-0/+1
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #32638 from yhirano55/navigate_edgeguide_from_github_template	Rafael França	2018-04-19	2	-2/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Navigate edgeguide from .github template [ci skip]	Yoshiyuki Hirano	2018-04-20	2	-2/+2
\| \|/ / / / / /
* \| \| \| \| \| \|	[ci skip] Remove style of the word Rails at the top	Guillermo Iguaran	2018-04-19	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #32626 from ftovaro/master	Xavier Noria	2018-04-19	2	-40/+54
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] Remove style of the word Rails at the top	Felipe Tovar	2018-04-19	1	-1/+1
\| * \| \| \| \| \| \|	[ci skip] Missing \ in RDOC_MAIN	Felipe Tovar	2018-04-19	0	-0/+0
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	[ci skip] update RDOC_MAIN	Felipe Tovar	2018-04-19	1	-23/+30
\| * \| \| \| \| \| \| \|	[ci skip] update RDOC_MAIN	Felipe Tovar	2018-04-19	1	-23/+30
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Update README	Felipe Tovar	2018-04-18	1	-18/+25
* \| \| \| \| \| \| \|	Merge pull request #32635 from yhirano55/update_coc	Guillermo Iguaran	2018-04-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update CoC to change a history of updates URL [ci skip]	Yoshiyuki Hirano	2018-04-19	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #32625 from stephendolan/master	Kasper Timm Hansen	2018-04-19	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] Fix minor system testing documentation typo.	Stephen	2018-04-18	1	-1/+1
* \| \| \| \| \| \| \|	Merge pull request #32627 from jlduran/make-master-key-readable-only-by-owner	Andrew White	2018-04-19	3	-0/+27
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Make the master.key readable only by the owner	Jose Luis Duran	2018-04-19	3	-0/+27
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #32633 from bogdanvlviv/fix-ref-in-actionpack-changelog	Ryuta Kamizono	2018-04-19	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix reference to fixed issue in actionpack/CHANGELOG.md	bogdanvlviv	2018-04-19	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #32613 from dsander/fix-as-timezone-all	Andrew White	2018-04-19	4	-1/+35
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into fix-as-timezone-all	Andrew White	2018-04-19	13	-26/+155
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Redis cache store: avoid blocking the server in `#delete_matched`	Gleb Mazovetskiy	2018-04-18	2	-6/+18
\| \|/ / / / / / \|/\| \| \| \| \| \|