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

	Commit message (Expand)	Author	Age	Files	Lines
*	Mention more ActiveStorage hooks in Active Support Instrumentation guide [ci ...	Younes SERRAJ	2019-04-17	1	-0/+25
*	Merge pull request #35886 from okuramasafumi/add-docs-to-concern	Ryuta Kamizono	2019-04-17	1	-1/+24
\|\
\| *	Add documentations to AS::Concern#included and #class_methods	okuramasafumi	2019-04-17	1	-0/+23
\| *	Add `:nodoc` to ActiveSupport::Concern#append_features	okuramasafumi	2019-04-16	1	-1/+1
* \|	Merge pull request #36006 from prathamesh-sonpatki/rm-unused-require	Ryuta Kamizono	2019-04-17	1	-1/+0
\|\ \
\| * \|	Removed unused require for active_support/deprecation	Prathamesh Sonpatki	2019-04-17	1	-1/+0
\|/ /
* \|	Merge pull request #35987 from kamipo/fix_dirty_tracking_after_rollback	Ryuta Kamizono	2019-04-17	9	-25/+92
\|\ \
\| * \|	Fix dirty tracking after rollback.	Ryuta Kamizono	2019-04-16	9	-25/+92
* \| \|	Prefer to indent and no blank line after private/protected [ci skip]	Ryuta Kamizono	2019-04-17	1	-1/+1
* \| \|	Merge pull request #35984 from vishaltelangre/asn-misc-fixes	Jeremy Daer	2019-04-16	3	-10/+18
\|\ \ \
\| * \| \|	Add test coverage	Vishal Telangre	2019-04-16	1	-4/+13
\| * \| \|	Remove @duration instance variable since we're not maintaining instances vari...	Vishal Telangre	2019-04-16	1	-2/+1
\| * \| \|	Use monotonic time to record `started` and `finished` time values for an even...	Vishal Telangre	2019-04-16	1	-2/+2
\| * \| \|	Fix: #cpu_time doesn't work for a `ActiveSupport::Notifications::Fanout::Subs...	Vishal Telangre	2019-04-16	1	-2/+2
* \| \| \|	[ci skip] More asset guide touch ups	Kasper Timm Hansen	2019-04-17	1	-4/+5
* \| \| \|	Merge pull request #35994 from soartec-lab/update_guide_asset_pipeline_change...	Kasper Timm Hansen	2019-04-17	1	-14/+6
\|\ \ \ \
\| * \| \| \|	Guide updated in line with changes in rails commands [skip ci]	soartec-lab	2019-04-16	1	-14/+6
* \| \| \| \|	Only retry tests on CI	Kasper Timm Hansen	2019-04-17	1	-1/+3
* \| \| \| \|	Fix bin/update references after 8927eba83c	Kasper Timm Hansen	2019-04-17	3	-10/+1
* \| \| \| \|	Merge pull request #33139 'bin-idempotent-setup'	Kasper Timm Hansen	2019-04-17	3	-50/+14
\|\ \ \ \ \
\| * \| \| \| \|	Factorize bin/update in bin/setup, and make bin/setup idempotent	David Stosik	2019-04-17	3	-50/+14
\| * \| \| \| \|	Merge branch 'collection-cache-versioning'	Kasper Timm Hansen	2019-04-16	5	-15/+93
\| \|\ \ \ \ \
* \| \ \ \ \ \	Merge pull request #34378 'collection-cache-versioning'	Kasper Timm Hansen	2019-04-16	5	-15/+93
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| / / / / / \| \|/ / / / /
\| * / / / /	Add collection cache versioning	Lachlan Sylvester	2019-04-16	5	-15/+93
\|/ / / / /
* \| \| \| \|	running test with_info_handler method	Mauri Mustonen	2019-04-16	2	-1/+8
* \| \| \| \|	Merge pull request #35997 from tjoyal/Rails/MailersController/do-not-leak-I18...	Rafael França	2019-04-16	2	-2/+12
\|\ \ \ \ \
\| * \| \| \| \|	[Rails::MailersController] Do not leak I18n global setting changes	Thierry Joyal	2019-04-16	2	-2/+12
* \| \| \| \| \|	Merge pull request #35996 from utilum/warning_useless_use	Kasper Timm Hansen	2019-04-16	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Squash warning: possibly useless use of a constant	utilum	2019-04-16	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #35995 from soartec-lab/update_guide_command_line_sample_code	Eileen M. Uchitelle	2019-04-16	1	-6/+5
\|\ \ \ \ \
\| * \| \| \| \|	Update the generate command sample codes [skip ci]	soartec-lab	2019-04-17	1	-6/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #35946 from alimi/cache-full-mysql-database-version	Kasper Timm Hansen	2019-04-16	4	-5/+18
\|\ \ \ \ \
\| * \| \| \| \|	Make changes per PR feedback	Ali Ibrahim	2019-04-12	2	-9/+3
\| * \| \| \| \|	Cache full MySQL version in schema cache	Ali Ibrahim	2019-04-11	4	-6/+25
* \| \| \| \| \|	Merge pull request #35985 from jhawthorn/lazy_backtrace_clean	Kasper Timm Hansen	2019-04-16	3	-2/+16
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Find query_source_location using lazy Enumerator	John Hawthorn	2019-04-15	3	-2/+16
* \| \| \| \| \|	Merge pull request #35989 from koic/bump_rubocop_to_0_67_2	Ryuta Kamizono	2019-04-16	6	-6/+14
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Bump RuboCop to 0.67.2	Koichi ITO	2019-04-16	6	-6/+14
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #35988 from sharang-d/format-documentation	Ryuta Kamizono	2019-04-16	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Format a comment to not show up as code [ci skip]	Sharang Dashputre	2019-04-16	1	-2/+2
\|/ / / / /
* \| \| \| \|	Add CHANGELOG entry for d1107f4d1e2573948d4941ac44511a0af6241f80	Ryuta Kamizono	2019-04-16	1	-1/+7
* \| \| \| \|	Merge pull request #35962 from y-yagi/migrate_config_file_to_new_settings	Yuji Yaginuma	2019-04-16	1	-6/+4
\|\ \ \ \ \
\| * \| \| \| \|	Migrate Code Climate config file to new configuration	yuuji.yaginuma	2019-04-16	1	-6/+4
\|/ / / / /
* / / / /	Don't refer `@transaction_state` directly	Ryuta Kamizono	2019-04-16	1	-5/+5
\|/ / / /
* \| \| \|	Merge pull request #35975 from xithan/master	Rafael França	2019-04-15	3	-12/+22
\|\ \ \ \
\| * \| \| \|	mounted routes with non-word characters	xithan	2019-04-15	3	-12/+22
* \| \| \| \|	Merge pull request #35977 from prathamesh-sonpatki/rm-required-in-generators	Rafael França	2019-04-15	2	-14/+3
\|\ \ \ \ \
\| * \| \| \| \|	Remove `required: true` from the model generator template	Prathamesh Sonpatki	2019-04-15	2	-14/+3
* \| \| \| \| \|	Merge pull request #35959 from jhawthorn/unbound_templates	Rafael França	2019-04-15	7	-14/+237
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add additional test for sharing templates	John Hawthorn	2019-04-12	1	-1/+18