aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove single element array preprocessRyuta Kamizono2017-07-262-2/+2
| | | | | Since 213796f, array predicate handler supports making binds, so the preprocess is no longer needed.
* Merge pull request #29940 from kamipo/update_gemfile_lockSean Griffin2017-07-251-3/+3
|\ | | | | Update Gemfile.lock to reflect arel 9.0.0.alpha
| * Update Gemfile.lock to reflect arel 9.0.0.alphaRyuta Kamizono2017-07-261-3/+3
| | | | | | | | Follow up to 089ca52.
* | Merge pull request #29932 from koic/supress_deprecated_warning_in_actioncableSean Griffin2017-07-251-1/+1
|\ \ | |/ |/| Suppress deprecated warning in Action Cable
| * Suppress deprecated warning in Action CableKoichi ITO2017-07-251-1/+1
| |
* | Require alpha arelSean Griffin2017-07-251-1/+1
| | | | | | | | | | | | | | | | | | Without this change, bundler will resolve a gemfile which is pointing at Rails master and not arel master. The error message that someone will get from doing this will be incredibly unhelpful, as it'll be the result of ActiveRecord being in a half-loaded that halted at `require "arel/collectors/composite"`, which was subsequently rescued in `"rails/all"`
* | Merge pull request #29934 from kamipo/remove_join_informationSean Griffin2017-07-253-10/+5
|\ \ | | | | | | Remove useless `JoinInformation`
| * | Remove useless `JoinInformation`Ryuta Kamizono2017-07-253-10/+5
| | | | | | | | | | | | | | | Since 213796f removed `binds`, `JoinInformation` only contain `joins`. So it is enough to return `joins` simply.
* | | Merge pull request #29935 from kamipo/remove_unused_queries_predicatesSean Griffin2017-07-251-12/+0
|\ \ \ | | | | | | | | Remove unused `queries_predicates`
| * | | Remove unused `queries_predicates`Ryuta Kamizono2017-07-251-12/+0
| | | | | | | | | | | | | | | | Since 213796f, `queries_predicates` is no longer used.
* | | | Merge pull request #29931 from ↵Sean Griffin2017-07-254-65/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | y-yagi/extract_assert_output_and_available_pty_to_module Extract `assert_output` and `available_pty?` into `ConsoleHelpers` module
| * | | | Extract `assert_output` and `available_pty?` into `ConsoleHelpers` moduleyuuji.yaginuma2017-07-254-65/+36
| | |_|/ | |/| | | | | | | | | | | | | | We define almost the same method with multiple tests. Therefore, it extract into module.
* | | | Fix failing testsSean Griffin2017-07-252-2/+2
| | | | | | | | | | | | | | | | `bind_values` was removed from Arel
* | | | Fix `dbconsole` test when tempdir is a long pathSean Griffin2017-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output of `.databases` in SQLite will truncate to a certain size. This causes the test to fail when run locally from a mac, or anything which has a tempdir with more than a few characters. This pragma has the same output, but presented as a normal query, meaning no truncation will occur.
* | | | Merge pull request #29928 from ↵Eileen M. Uchitelle2017-07-251-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | koic/fix_test_add_column_with_timestamp_type_oracle Fix `test_add_column_with_timestamp_type` when using Oracle
| * | | | 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 generation
| * | | Stop creating ApplicationRecord on model generationLisa Ugray2017-07-2410-57/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating models, we created ApplicationRecord in the default location if no file existed there. That was annoying for people who moved it to somewhere else in the autoload path. At this point, the vast majority of apps should have either run the upgrade script or generated a model since upgrading. For those that haven't the error message after generating a new model should be helpful: NameError: uninitialized constant ApplicationRecord To ease friction in that case, this also adds a generator for ApplicationRecord.
* | | | 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 callbacks
| * | | [ci skip] Add documentation for after_create_commit and after_update_commit ↵jagdeepsingh2017-07-251-0/+29
|/ / / | | | | | | | | | callbacks
* | | Merge pull request #29919 from kirs/actionpack-frozen-friendlyRafael França2017-07-249-10/+26
|\ \ \ | | | | | | | | Make actionpack frozen string friendly
| * | | 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`
| * | | Fix `warning: ambiguous first argument`yuuji.yaginuma2017-07-251-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | This fixes the following warning: ``` railties/test/application/rake/dbs_test.rb:265: warning: ambiguous first argument; put parentheses or a space even after `/' operator ```
* | | Merge pull request #29866 from rlue/masterRafael França2017-07-241-4/+4
|\ \ \ | | | | | | | | [API DOCUMENTATION] [MINOR] Correct description of ActionController::Parameters#delete
| * | | 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 warning
| * | | | remove depreciated assertion to eliminate warningChristina Thompson2017-07-241-1/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Yuki Nishijima <yk.nishijima@gmail.com>
* | | | Merge pull request #29898 from ↵Rafael França2017-07-244-1/+65
|\ \ \ \ | |/ / / |/| | | | | | | | | | | deivid-rodriguez/follow_up_to_multiple_location_engine_mounting Fix regression introduced by fixing mounting the same engine in multiple locations
| * | | 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 constraint
| * | | | Update rack-test dependency constraintDwight Watson2017-07-242-69/+78
| | | | |
* | | | | Merge pull request #29918 from ↵Rafael França2017-07-241-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | xtina-starr/suppress-warning-from-actionview-controller-helper Suppress warning from actionview controller helper.
| * | | | Suppress warning from actionview controller helper.Christina Thompson2017-07-241-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | Explicitly pass a destructed array to the delegate method. Signed-off-by: Yuki Nishijima <yk.nishijima@gmail.com>
* | | | Merge pull request #29897 from kirs/frozen-actionviewRafael França2017-07-24178-1/+354
|\ \ \ \ | | | | | | | | | | Use frozen string literal in actionview/
| * | | | 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 tests
| * | | | | Fix warnings in railties testsDavid Rodríguez2017-07-242-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | This warning has been fixed in sass-rails. This change picks up the fix.
* | | | | | Merge pull request #29848 from kamipo/fix_distinct_count_with_order_and_limitRafael França2017-07-247-45/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix `COUNT(DISTINCT ...)` with `ORDER BY` and `LIMIT`
| * | | | | | Extract `Account` model to the dedicated fileRyuta Kamizono2017-07-222-34/+35
| | | | | | |
| * | | | | | Should keep the table name qualified `*` for distinct subqueryRyuta Kamizono2017-07-222-1/+13
| | | | | | |
| * | | | | | Fix `COUNT(DISTINCT ...)` with `ORDER BY` and `LIMIT`Ryuta Kamizono2017-07-225-11/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #26972, `ORDER BY` is kept if `LIMIT` is presented for performance. But in most SQL servers (e.g. PostgreSQL, SQL Server, etc), `ORDER BY` expressions must appear in select list for `SELECT DISTINCT`. We should not replace existing select list in that case.
* | | | | | | Merge pull request #29915 from kamipo/fix_warning_assigned_but_unused_variableRafael França2017-07-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix `warning: assigned but unused variable - comment`
| * | | | | | | Fix `warning: assigned but unused variable - comment`Ryuta Kamizono2017-07-251-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` % ARCONN=sqlite3 be ruby -w -Itest test/cases/associations/belongs_to_associations_test.rb -n test_multiple_counter_cache_with_after_create_update test/cases/associations/belongs_to_associations_test.rb:1181: warning: assigned but unused variable - comment Using sqlite3 Run options: -n test_multiple_counter_cache_with_after_create_update --seed 49644 . Finished in 0.114266s, 8.7515 runs/s, 17.5030 assertions/s. 1 runs, 2 assertions, 0 failures, 0 errors, 0 skips ```
* | | | | | | Merge pull request #29902 from y-yagi/fix_29880Rafael França2017-07-241-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Do not show URL in boot info when using Puma
| * | | | | | | Do not show URL in boot info when using Pumayuuji.yaginuma2017-07-241-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Puma has its own configuration file(e.g. `config/puma.rb`). Can define a port and a URL to bind in the configuration file. Therefore, on Rails side, can not grasp which URI to bind finally. Because of that, it may show a URL different from the actually bound URL, so I think that it is better not to show it. Fixes #29880
* | | | | | | | Merge pull request #29853 from lugray/move_generator_namespacing_to_baseRafael França2017-07-242-36/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move generator namespacing to Base
| * | | | | | | | Move generator namespacing to BaseLisa Ugray2017-07-192-36/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generators need to be aware of namespace to work properly in engines. Methods to help with this lived in Rails::Generators::NamedBase. Moving them to Rails::Generators::Base (which NamedBase inherits from) allows a follow-up in which a namespace aware unnamed generator can be created.
* | | | | | | | | Merge pull request #29792 from lugray/delegate_respond_toRafael França2017-07-242-2/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Delegate respond_to? in ActionView::Helpers::ControllerHelper
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 16:23:58 +0000