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

	Commit message (Expand)	Author	Age	Files	Lines
*	Use exact Rails version when verifying.	Kasper Timm Hansen	2017-07-25	1	-1/+6
*	Require arel master in the benchmark template	Sean Griffin	2017-07-25	1	-0/+1
*	Merge pull request #29941 from kamipo/remove_single_element_array_preprocess	Sean Griffin	2017-07-25	2	-2/+2
\|\
\| *	Remove single element array preprocess	Ryuta Kamizono	2017-07-26	2	-2/+2
* \|	Merge pull request #29942 from lugray/doc_clarification [ci skip]	Sean Griffin	2017-07-25	1	-0/+1
\|\ \
\| * \|	Clarify add_column limit documentation	Lisa Ugray	2017-07-25	1	-0/+1
* \| \|	Merge pull request #29926 from pawandubey:fix-test-with-absolute-paths	Kasper Timm Hansen	2017-07-25	2	-1/+30
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Allow bin/rails test task to take absolute paths as arguments	Pawan Dubey	2017-07-25	2	-3/+29
* \| \|	Allow `Relation#or` to accept a relation with different `references`	Sean Griffin	2017-07-25	3	-1/+20
\| \|/ \|/\|
* \|	Merge pull request #29940 from kamipo/update_gemfile_lock	Sean Griffin	2017-07-25	1	-3/+3
\|\ \
\| * \|	Update Gemfile.lock to reflect arel 9.0.0.alpha	Ryuta Kamizono	2017-07-26	1	-3/+3
* \| \|	Merge pull request #29932 from koic/supress_deprecated_warning_in_actioncable	Sean Griffin	2017-07-25	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Suppress deprecated warning in Action Cable	Koichi ITO	2017-07-25	1	-1/+1
* \| \|	Require alpha arel	Sean Griffin	2017-07-25	1	-1/+1
* \| \|	Merge pull request #29934 from kamipo/remove_join_information	Sean Griffin	2017-07-25	3	-10/+5
\|\ \ \
\| * \| \|	Remove useless `JoinInformation`	Ryuta Kamizono	2017-07-25	3	-10/+5
* \| \| \|	Merge pull request #29935 from kamipo/remove_unused_queries_predicates	Sean Griffin	2017-07-25	1	-12/+0
\|\ \ \ \
\| * \| \| \|	Remove unused `queries_predicates`	Ryuta Kamizono	2017-07-25	1	-12/+0
* \| \| \| \|	Merge pull request #29931 from y-yagi/extract_assert_output_and_available_pty...	Sean Griffin	2017-07-25	4	-65/+36
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Extract `assert_output` and `available_pty?` into `ConsoleHelpers` module	yuuji.yaginuma	2017-07-25	4	-65/+36
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Fix failing tests	Sean Griffin	2017-07-25	2	-2/+2
* \| \| \|	Fix `dbconsole` test when tempdir is a long path	Sean Griffin	2017-07-25	1	-1/+1
* \| \| \|	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