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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #24814 from vipulnsward/24811-fix-double-tasks	Arthur Nogueira Neves	2017-01-03	1	-1/+0
\|\
\| *	Don't list out tasks as separately that are under lib, which cause them to be...	Vipul A M	2016-07-09	1	-1/+0
* \|	Merge pull request #27363 from amatsuda/refined_array_sum	Sean Griffin	2017-01-03	1	-2/+7
\|\ \
\| * \|	Refining Array#sum monkey-patch using Refinements	Akira Matsuda	2016-12-15	1	-2/+7
* \| \|	Merge pull request #27548 from tylerhunt/fix-duplicate-disable-with	Sean Griffin	2017-01-03	2	-14/+25
\|\ \ \
\| * \| \|	Prevent duplicate data-disable-with attributes	Tyler Hunt	2017-01-03	2	-14/+25
* \| \| \|	Merge pull request #27538 from davidsherline/guides-bi-dir-associations	Sean Griffin	2017-01-03	1	-23/+41
\|\ \ \ \
\| * \| \| \|	Clarify Bi-directional Associations docs	David Sherline	2017-01-03	1	-23/+41
* \| \| \| \|	Merge pull request #27335 from kamipo/remove_duplicated_model_definition	Sean Griffin	2017-01-03	2	-10/+4
\|\ \ \ \ \
\| * \| \| \| \|	Remove duplicated model class definitions in `test/cases/base_test.rb`	Ryuta Kamizono	2016-12-12	2	-10/+4
* \| \| \| \| \|	Consistently apply adapter behavior when serializing arrays	Sean Griffin	2017-01-03	5	-17/+62
* \| \| \| \| \|	Merge pull request #27435 from kamipo/follow_up_25307	Sean Griffin	2017-01-03	3	-4/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Active Record supports MySQL >= 5.1.10	Ryuta Kamizono	2016-12-22	3	-4/+4
* \| \| \| \| \| \|	Merge pull request #27491 from kamipo/add_missing_emit_warning	Sean Griffin	2017-01-03	1	-0/+5
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add missing `emit_warning_if_needed` for `changed?`	Ryuta Kamizono	2016-12-29	1	-0/+5
* \| \| \| \| \| \| \|	Merge pull request #27537 from Le6ow5k1/sti	Andrew White	2017-01-03	4	-10/+33
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Cache results of computing model type	Konstantin Lazarev	2017-01-03	4	-10/+33
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #27543 from kamipo/fix_update_counters_of_multiple_records...	Kasper Timm Hansen	2017-01-02	4	-41/+50
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Counter cache touching don't need object finding anymore	Ryuta Kamizono	2017-01-03	1	-6/+5
\| * \| \| \| \| \| \|	Push `current_time_from_proper_timezone` and timestamp attributes methods up ...	Ryuta Kamizono	2017-01-03	2	-35/+35
\| * \| \| \| \| \| \|	Fix update counters of multiple records with touch: true	Ryuta Kamizono	2017-01-03	2	-1/+11
* \| \| \| \| \| \| \|	Merge pull request #27542 from utilum/remove_duplicate_test	Kasper Timm Hansen	2017-01-02	1	-8/+0
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove duplicated test	utilum	2017-01-02	1	-8/+0
\|/ / / / / / /
* \| \| \| \| \| \|	[ci skip] Use touch; slim wording.	Kasper Timm Hansen	2017-01-02	1	-2/+2
* \| \| \| \| \| \|	Merge pull request #27508 from zzz6519003/patch-1	Rafael França	2017-01-01	1	-2/+0
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	remove useless import	Snowmanzzz(Zhengzhong Zhao)	2016-12-30	1	-2/+0
* \| \| \| \| \| \| \|	Merge pull request #27526 from kirs/database-tasks-schema-cache	Rafael França	2017-01-01	3	-4/+21
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Dump schema cache for custom connection	Kir Shatrov	2017-01-01	3	-4/+21
* \| \| \| \| \| \| \| \|	Merge pull request #27541 from kenta-s/fix-grammar-in-counter_cache_rb	Rafael França	2017-01-01	1	-3/+3
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fix grammar in active_record/counter_cache.rb [ci skip]	kenta-s	2017-01-02	1	-3/+3
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #27540 from kamipo/touch_time_should_be_type_casted	Rafael França	2017-01-01	1	-3/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	`touch_time` should be type casted to respect the precision of the column	Ryuta Kamizono	2017-01-02	1	-3/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #27520 from prathamesh-sonpatki/merge-uncountable-tests-fo...	Rafael França	2017-01-01	1	-11/+21
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Make the tests for uncountability of ascii and non-ascii words uniform	Prathamesh Sonpatki	2016-12-31	1	-11/+21
* \| \| \| \| \| \| \| \| \|	Merge pull request #27539 from kamipo/counter_cache_touching_improvements	Rafael França	2017-01-01	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Prefer `each` over `map` because unused return value	Ryuta Kamizono	2017-01-02	1	-1/+1
\| * \| \| \| \| \| \| \| \| \|	Don't invoke `touch_updates` if `touch` does not supplied	Ryuta Kamizono	2017-01-02	1	-3/+3
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Replace sleep with synchronization	Matthew Draper	2017-01-02	2	-2/+8
* \| \| \| \| \| \| \| \| \|	Fix tests with counter cache touching and more.	Kasper Timm Hansen	2017-01-01	3	-104/+98
* \| \| \| \| \| \| \| \| \|	Added option to ActiveRecord::CounterCache methods.	Jarred Trost	2017-01-01	3	-8/+216
\| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Revert "Merge pull request #27528 from kamipo/extract_casted_booleans"	Kasper Timm Hansen	2017-01-01	2	-18/+18
* \| \| \| \| \| \| \| \|	Merge pull request #27536 from prathamesh-sonpatki/rm-bin-yarn-if-yarn-is-ski...	Kasper Timm Hansen	2017-01-01	2	-2/+9
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Remove bin/yarn if yarn is skipped, tidy up tests	Prathamesh Sonpatki	2017-01-01	2	-2/+9
* \| \| \| \| \| \| \| \| \|	Fix Symbol#duplicable? for Ruby 2.4.0.	Kasper Timm Hansen	2017-01-01	2	-3/+4
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #27535 from y-yagi/add_test_script_for_railties	Kasper Timm Hansen	2017-01-01	1	-0/+4
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	add `bin/test` script for railties	yuuji.yaginuma	2017-01-01	1	-0/+4
* \| \| \| \| \| \| \| \| \|	Merge pull request #27534 from y-yagi/remove_unnecessary_remove_file	Kasper Timm Hansen	2017-01-01	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	remove unnecessary `remove_file`	yuuji.yaginuma	2017-01-01	1	-1/+0
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #27531 from kamipo/string_timestamp_attributes	Kasper Timm Hansen	2017-01-01	2	-12/+11
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Change `timestamp_attributes_for_{create,update}` from symbol to string	Ryuta Kamizono	2017-01-01	2	-12/+11
\|/ / / / / / / / /