aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix testing helpers that use Action View's capturing helpers (e.g. content_for)George Claghorn2017-07-252-0/+10
* Use exact Rails version when verifying.Kasper Timm Hansen2017-07-251-1/+6
* Require arel master in the benchmark templateSean Griffin2017-07-251-0/+1
* Merge pull request #29941 from kamipo/remove_single_element_array_preprocessSean Griffin2017-07-252-2/+2
|\
| * Remove single element array preprocessRyuta Kamizono2017-07-262-2/+2
* | Merge pull request #29942 from lugray/doc_clarification [ci skip]Sean Griffin2017-07-251-0/+1
|\ \
| * | Clarify add_column limit documentationLisa Ugray2017-07-251-0/+1
* | | Merge pull request #29926 from pawandubey:fix-test-with-absolute-pathsKasper Timm Hansen2017-07-252-1/+30
|\ \ \ | |/ / |/| |
| * | Allow bin/rails test task to take absolute paths as argumentsPawan Dubey2017-07-252-3/+29
* | | Allow `Relation#or` to accept a relation with different `references`Sean Griffin2017-07-253-1/+20
| |/ |/|
* | Merge pull request #29940 from kamipo/update_gemfile_lockSean Griffin2017-07-251-3/+3
|\ \
| * | Update Gemfile.lock to reflect arel 9.0.0.alphaRyuta Kamizono2017-07-261-3/+3
* | | Merge pull request #29932 from koic/supress_deprecated_warning_in_actioncableSean Griffin2017-07-251-1/+1
|\ \ \ | |/ / |/| |
| * | Suppress deprecated warning in Action CableKoichi ITO2017-07-251-1/+1
* | | Require alpha arelSean Griffin2017-07-251-1/+1
* | | Merge pull request #29934 from kamipo/remove_join_informationSean Griffin2017-07-253-10/+5
|\ \ \
| * | | Remove useless `JoinInformation`Ryuta Kamizono2017-07-253-10/+5
* | | | Merge pull request #29935 from kamipo/remove_unused_queries_predicatesSean Griffin2017-07-251-12/+0
|\ \ \ \
| * | | | Remove unused `queries_predicates`Ryuta Kamizono2017-07-251-12/+0
* | | | | Merge pull request #29931 from y-yagi/extract_assert_output_and_available_pty...Sean Griffin2017-07-254-65/+36
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Extract `assert_output` and `available_pty?` into `ConsoleHelpers` moduleyuuji.yaginuma2017-07-254-65/+36
| | |_|/ | |/| |
* | | | Fix failing testsSean Griffin2017-07-252-2/+2
* | | | Fix `dbconsole` test when tempdir is a long pathSean Griffin2017-07-251-1/+1
* | | | Merge pull request #29928 from koic/fix_test_add_column_with_timestamp_type_o...Eileen M. Uchitelle2017-07-251-0/+2
|\ \ \ \
| * | | | Fix `test_add_column_with_timestamp_type` when using OracleKoichi ITO2017-07-251-0/+2
| |/ / /
* | | | Merge pull request #29916 from lugray/stop_generating_application_recordEileen M. Uchitelle2017-07-2510-57/+66
|\ \ \ \ | |_|/ / |/| | |
| * | | Stop creating ApplicationRecord on model generationLisa Ugray2017-07-2410-57/+66
* | | | Merge pull request #29930 from JagdeepSingh/add-callbacks-documentationप्रथमेश Sonpatki2017-07-251-0/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | [ci skip] Add documentation for after_create_commit and after_update_commit c...jagdeepsingh2017-07-251-0/+29
|/ / /
* | | Merge pull request #29919 from kirs/actionpack-frozen-friendlyRafael França2017-07-249-10/+26
|\ \ \
| * | | Make actionpack frozen string friendlyKir Shatrov2017-07-249-10/+26
| |/ /
* | | Merge pull request #29924 from y-yagi/fix_ruby_warningRafael França2017-07-241-1/+1
|\ \ \
| * | | Fix `warning: ambiguous first argument`yuuji.yaginuma2017-07-251-1/+1
|/ / /
* | | Merge pull request #29866 from rlue/masterRafael França2017-07-241-4/+4
|\ \ \
| * | | Fix typo in API docsRyan Lue2017-07-201-1/+1
| * | | Correct API documentation for ActionController::Parameters#deleteRyan Lue2017-07-201-4/+4
* | | | Merge pull request #29921 from xtina-starr/remove-depreciated-assertionRafael França2017-07-241-1/+1
|\ \ \ \
| * | | | remove depreciated assertion to eliminate warningChristina Thompson2017-07-241-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #29898 from deivid-rodriguez/follow_up_to_multiple_locatio...Rafael França2017-07-244-1/+65
|\ \ \ \ | |/ / / |/| | |
| * | | Fix regression from multiple mountpoint supportDavid Rodríguez2017-07-244-1/+65
* | | | Merge pull request #29859 from dwightwatson/feature/rack-testRafael Mendonça França2017-07-242-66/+71
|\ \ \ \
| * | | | Update rack-test dependency constraintDwight Watson2017-07-242-69/+78
* | | | | Merge pull request #29918 from xtina-starr/suppress-warning-from-actionview-c...Rafael França2017-07-241-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Suppress warning from actionview controller helper.Christina Thompson2017-07-241-1/+1
|/ / / /
* | | | Merge pull request #29897 from kirs/frozen-actionviewRafael França2017-07-24178-1/+354
|\ \ \ \
| * | | | Use frozen string literal in actionview/Kir Shatrov2017-07-24178-1/+354
* | | | | Merge pull request #29908 from deivid-rodriguez/fix_warnings_in_railties_testsRafael França2017-07-242-11/+21
|\ \ \ \ \
| * | | | | Fix warnings in railties testsDavid Rodríguez2017-07-242-11/+21
* | | | | | Merge pull request #29848 from kamipo/fix_distinct_count_with_order_and_limitRafael França2017-07-247-45/+87
|\ \ \ \ \ \
| * | | | | | Extract `Account` model to the dedicated fileRyuta Kamizono2017-07-222-34/+35