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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #29928 from koic/fix_test_add_column_with_timestamp_type_o...	Eileen M. Uchitelle	2017-07-25	1	-0/+2
\|\
\| *	Fix `test_add_column_with_timestamp_type` when using Oracle	Koichi ITO	2017-07-25	1	-0/+2
* \|	Merge pull request #29916 from lugray/stop_generating_application_record	Eileen M. Uchitelle	2017-07-25	10	-57/+66
\|\ \
\| * \|	Stop creating ApplicationRecord on model generation	Lisa Ugray	2017-07-24	10	-57/+66
* \| \|	Merge pull request #29930 from JagdeepSingh/add-callbacks-documentation	प्रथमेश Sonpatki	2017-07-25	1	-0/+29
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	[ci skip] Add documentation for after_create_commit and after_update_commit c...	jagdeepsingh	2017-07-25	1	-0/+29
\|/ /
* \|	Merge pull request #29919 from kirs/actionpack-frozen-friendly	Rafael França	2017-07-24	9	-10/+26
\|\ \
\| * \|	Make actionpack frozen string friendly	Kir Shatrov	2017-07-24	9	-10/+26
\| \|/
* \|	Merge pull request #29924 from y-yagi/fix_ruby_warning	Rafael França	2017-07-24	1	-1/+1
\|\ \
\| * \|	Fix `warning: ambiguous first argument`	yuuji.yaginuma	2017-07-25	1	-1/+1
\|/ /
* \|	Merge pull request #29866 from rlue/master	Rafael França	2017-07-24	1	-4/+4
\|\ \
\| * \|	Fix typo in API docs	Ryan Lue	2017-07-20	1	-1/+1
\| * \|	Correct API documentation for ActionController::Parameters#delete	Ryan Lue	2017-07-20	1	-4/+4
* \| \|	Merge pull request #29921 from xtina-starr/remove-depreciated-assertion	Rafael França	2017-07-24	1	-1/+1
\|\ \ \
\| * \| \|	remove depreciated assertion to eliminate warning	Christina Thompson	2017-07-24	1	-1/+1
* \| \| \|	Merge pull request #29898 from deivid-rodriguez/follow_up_to_multiple_locatio...	Rafael França	2017-07-24	4	-1/+65
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix regression from multiple mountpoint support	David Rodríguez	2017-07-24	4	-1/+65
* \| \| \|	Merge pull request #29859 from dwightwatson/feature/rack-test	Rafael Mendonça França	2017-07-24	2	-66/+71
\|\ \ \ \
\| * \| \| \|	Update rack-test dependency constraint	Dwight Watson	2017-07-24	2	-69/+78
* \| \| \| \|	Merge pull request #29918 from xtina-starr/suppress-warning-from-actionview-c...	Rafael França	2017-07-24	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Suppress warning from actionview controller helper.	Christina Thompson	2017-07-24	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #29897 from kirs/frozen-actionview	Rafael França	2017-07-24	178	-1/+354
\|\ \ \ \
\| * \| \| \|	Use frozen string literal in actionview/	Kir Shatrov	2017-07-24	178	-1/+354
* \| \| \| \|	Merge pull request #29908 from deivid-rodriguez/fix_warnings_in_railties_tests	Rafael França	2017-07-24	2	-11/+21
\|\ \ \ \ \
\| * \| \| \| \|	Fix warnings in railties tests	David Rodríguez	2017-07-24	2	-11/+21
* \| \| \| \| \|	Merge pull request #29848 from kamipo/fix_distinct_count_with_order_and_limit	Rafael França	2017-07-24	7	-45/+87
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Extract `Account` model to the dedicated file	Ryuta Kamizono	2017-07-22	2	-34/+35
\| * \| \| \| \| \|	Should keep the table name qualified `*` for distinct subquery	Ryuta Kamizono	2017-07-22	2	-1/+13
\| * \| \| \| \| \|	Fix `COUNT(DISTINCT ...)` with `ORDER BY` and `LIMIT`	Ryuta Kamizono	2017-07-22	5	-11/+40
* \| \| \| \| \| \|	Merge pull request #29915 from kamipo/fix_warning_assigned_but_unused_variable	Rafael França	2017-07-24	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix `warning: assigned but unused variable - comment`	Ryuta Kamizono	2017-07-25	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #29902 from y-yagi/fix_29880	Rafael França	2017-07-24	1	-2/+6
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Do not show URL in boot info when using Puma	yuuji.yaginuma	2017-07-24	1	-2/+6
* \| \| \| \| \| \| \|	Merge pull request #29853 from lugray/move_generator_namespacing_to_base	Rafael França	2017-07-24	2	-36/+37
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Move generator namespacing to Base	Lisa Ugray	2017-07-19	2	-36/+37
* \| \| \| \| \| \| \| \|	Merge pull request #29792 from lugray/delegate_respond_to	Rafael França	2017-07-24	2	-2/+21
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Delegate respond_to? in ActionView::Helpers::ControllerHelper	Lisa Ugray	2017-07-19	2	-2/+21
* \| \| \| \| \| \| \| \| \|	Merge pull request #29765 from lugray/fix_counter_cache	Rafael França	2017-07-24	4	-4/+18
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Add test for fixed `counter_cache` double increment	Lisa Ugray	2017-07-19	4	-4/+18
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #29912 from rails/revert-29911-schneems/rack-mini-profiler	Rafael França	2017-07-24	2	-7/+0
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Revert "Include rack-mini-profiler by default"	Rafael França	2017-07-24	2	-7/+0
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #29911 from schneems/schneems/rack-mini-profiler	Sean Griffin	2017-07-24	2	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Include rack-mini-profiler by default	schneems	2017-07-24	2	-0/+7
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Fix test failures when prepared statements are disabled	Sean Griffin	2017-07-24	3	-14/+35
* \| \| \| \| \| \| \| \| \| \|	Fix build failures on PG	Sean Griffin	2017-07-24	1	-0/+4
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #29905 from kamipo/remove_duplicated_assertion	Sean Griffin	2017-07-24	1	-16/+2
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Remove duplicated assertion in `test_count_with_join`	Ryuta Kamizono	2017-07-24	1	-16/+2
* \| \| \| \| \| \| \| \| \| \| \|	Fix build failures on MySQL	Sean Griffin	2017-07-24	2	-2/+2
* \| \| \| \| \| \| \| \| \| \| \|	Refactor Active Record to let Arel manage bind params	Sean Griffin	2017-07-24	37	-459/+283
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #29894 from eugeneius/check_schema_file_dup_string	Kasper Timm Hansen	2017-07-24	2	-1/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \|