aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #29029 from timolehto/masterRafael França2017-05-111-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | rake -T should load development env by default, not test
| * | | | | | | rake -T should load development env by default, not testTimo Kilpilehto2017-05-101-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #29034 from peterjm/handle_loops_in_exception_handlingRafael França2017-05-112-3/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Handle loops in the cause chain in Rescuable#rescue_with_handler
| * | | | | | | handle loops in the cause chain in Rescuable#rescue_with_handlerPeter McCracken2017-05-102-3/+41
| | | | | | | |
* | | | | | | | Merge pull request #29040 from eugeneius/parameters_delete_blockAaron Patterson2017-05-112-2/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Pass block in ActionController::Parameters#delete
| * | | | | | | | Pass block in ActionController::Parameters#deleteEugene Kenny2017-05-102-2/+23
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to fully support the same interface as `Hash#delete`, we need to pass the block through to the underlying method, not just the key. This used to work correctly, but it regressed when `ActionController::Parameters` stopped inheriting from `Hash` in 5.0.
* | | | | | | | Merge pull request #29043 from kamipo/dont_eager_loading_if_unneeded_for_existsAaron Patterson2017-05-113-4/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't eager loading if unneeded for `FinderMethods#exists?`
| * | | | | | | | Don't eager loading if unneeded for `FinderMethods#exists?`Ryuta Kamizono2017-05-113-4/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #29025.
* | | | | | | | Defer loading each DB Tasks class from AR DatabaseTasksAkira Matsuda2017-05-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we don't need to load tasks for DBs that we don't use for the current app. Also, these Tasks classes load AR::Base in their class level, and so immediately kick :active_record on_load hooks. This used to happen when we were loading tasks, not when we run a task.
* | | | | | | | Merge pull request #29044 from koic/fix_typo_in_guideVipul A M2017-05-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix a typo in guide [ci skip]
| * | | | | | | Fix a typo in guide [ci skip]Koichi ITO2017-05-111-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #29022 from ↵Matthew Draper2017-05-101-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | y-yagi/allow_to_receive_arbitrary_arguments_in_aggregated_results Allow to receive arbitrary arguments in `aggregated_results`
| * | | | | | Allow to receive arbitrary arguments in `aggregated_results`yuuji.yaginuma2017-05-101-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Argument was added to `aggregated_results` in minitest 5.10.2. Ref: https://github.com/seattlerb/minitest/commit/c6ba2afd90473b76d289562edd24f7d7ca8484f9
* | | | | | Merge pull request #28995 from jcoyne/update_capybaraMatthew Draper2017-05-093-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow capybara minor releases
| * | | | | | Allow capybara minor releasesJustin Coyne2017-05-053-8/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Capybara 2.14.0 was released. Loosen the tight constraint in the generated Gemfile, so that Rails applications can take advantage of the new version
* | | | | | Merge pull request #28240 from kreintjes/fix/autoloading-sti-guideMatthew Draper2017-05-091-9/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Correct Autoloading and STI guide (issue #26994)
| * | | | | | Correct Autoloading and STI guide (issue #26994)Kevin Reintjes2017-04-061-9/+8
| | | | | | |
* | | | | | | Merge pull request #29012 from y-yagi/fix_link_to_assert_nothing_raised_docRobin Dupret2017-05-081-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fix link to `assert_nothing_raised` doc [ci skip]
| * | | | | | Fix link to `assert_nothing_raised` doc [ci skip]yuuji.yaginuma2017-05-081-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | The `assert_nothing_raised` was moved to `ActiveSupport::Testing::Assertions` in 3cece0b6574c496605df055a2ebf77177f5b6e7f.
* | | | | | Merge pull request #29005 from kamipo/should_escape_meta_chars_in_regexpKasper Timm Hansen2017-05-0730-118/+118
|\ \ \ \ \ \ | | | | | | | | | | | | | | Should escape meta characters in regexp
| * | | | | | Should escape meta characters in regexpRyuta Kamizono2017-05-0730-118/+118
|/ / / / / /
* | | | | | Merge pull request #29002 from kamipo/fix_warning_ambiguous_first_argumentMatthew Draper2017-05-071-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix `warning: ambiguous first argument`
| * | | | | | Fix `warning: ambiguous first argument`Ryuta Kamizono2017-05-061-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` % ARCONN=sqlite3 be ruby -w -Itest test/cases/quoting_test.rb test/cases/quoting_test.rb:92: warning: ambiguous first argument; put parentheses or a space even after `/' operator test/cases/quoting_test.rb:96: warning: ambiguous first argument; put parentheses or a space even after `/' operator Using sqlite3 Run options: --seed 9495 ..................................... Finished in 0.046403s, 797.3622 runs/s, 1120.6172 assertions/s. 37 runs, 52 assertions, 0 failures, 0 errors, 0 skips ```
* | | | | | Merge pull request #28989 from matthewd/quoted_id-deprecationMatthew Draper2017-05-062-2/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clarify deprecation message for #quoted_id
| * | | | | | Clarify deprecation message for #quoted_idMatthew Draper2017-05-052-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this case, it's the method definition that's more at fault, rather than the current caller.
* | | | | | | Merge pull request #28999 from kamipo/remove_unused_delegation_test_call_methodRafael França2017-05-051-27/+7
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Remove unused `DelegationTest#call_method`
| * | | | | | Remove unused `DelegationTest#call_method`Ryuta Kamizono2017-05-061-27/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | `DelegationTest#call_method` is no longer used since 9d79334a.
* | | | | | Merge pull request #28981 from kamipo/dont_use_arel_engineMatthew Draper2017-05-054-10/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't pass `arel.engine` to `Arel::SelectManager.new`
| * | | | | | Don't pass `arel.engine` to `Arel::SelectManager.new`Ryuta Kamizono2017-05-054-10/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The argument of `Arel::SelectManager.new` is `table`, not `engine`. https://github.com/rails/arel/blob/v8.0.0/lib/arel/select_manager.rb#L10
* | | | | | Merge pull request #28986 from tjschuck/delegate_missing_to_doc_fixesRafael França2017-05-042-28/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Assorted delegate_missing_to doc fixes
| * | | | | | Update test names to match method nameT.J. Schuck2017-05-041-6/+6
| | | | | | | | | | | | | | | | | | | | | The method is named `delegate_missing_to`, not `delegate_to_missing`
| * | | | | | Assorted delegate_missing_to doc fixesT.J. Schuck2017-05-041-22/+17
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix rdoc code formatting — `tt`, not backticks * Fix/simplify sentence grammar — should at least just be “and the like”, not “likes”, but this is just general tightening up. * Add note that delegated methods must be public. Tested here: https://github.com/rails/rails/blob/7ff5ccae94ce2aff76b5f8a31a28e305a047d642/activesupport/test/core_ext/module_test.rb#L359-L365 * Simplify example code for delegate_missing_to. The example had complexity that wasn’t necessary for demonstrating `delegate_missing_to`. This gets rid of a bunch of cruft so the example is more obvious about what’s going on regarding the feature itself. [ci skip]
* | | | | | Merge pull request #28983 from ↵Rafael França2017-05-041-11/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_useless_target_records_from_association Remove useless `target_records_from_association`
| * | | | | | Remove useless `target_records_from_association`Ryuta Kamizono2017-05-041-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since through association is always loaded by `preloader.preload`.
* | | | | | | Merge pull request #28984 from yahonda/mysql2_046Rafael França2017-05-041-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Use mysql2 0.4.6 to suport MySQL 8.0.1
| * | | | | | Use mysql2 0.4.6 to suport MySQL 8.0.1Yasuo Honda2017-05-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up #28733 and brianmario/mysql2#840
* | | | | | | Avoid rubygems 2.6.12 for nowMatthew Draper2017-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's causing a test to fail, and we're not yet sure what (if anything) we should be doing differently. See rubygems/rubygems#1911.
* | | | | | | Merge pull request #28979 from y-yagi/build_package_json_in_create_root_filesRafael França2017-05-031-4/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move `package.json` creation to `create_root_files`
| * | | | | | | Move `package.json` creation to `create_root_files`yuuji.yaginuma2017-05-041-4/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `package.json` is created in root directory, it is appropriate to create it in `create_root_files`.
* | | | | | | Merge pull request #28337 from riseshia/patch-1Rafael França2017-05-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix to use correct path with language on guide
| * | | | | | | Fix to use correct path with language on guideShia2017-03-081-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #28978 from riseshia/patch-2Rafael França2017-05-031-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Use target language's document.yaml [ci skip]
| * | | | | | | Use target language's document.yaml [ci skip]Shia2017-05-041-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let me build guide with "ko" language, Before: - It try to use guides/source/documents.yaml After: - It try to use guides/source/ko/documents.yaml
* | | | | | | Merge pull request #28976 from kamipo/should_test_bound_attributesRafael França2017-05-031-8/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Should test against `Relation#bound_attributes`
| * | | | | | | Should test against `Relation#bound_attributes`Ryuta Kamizono2017-05-041-8/+12
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Since legacy `Relation#bind_values` was removed in b06f64c.
* | | | | | | Merge pull request #28974 from kamipo/extract_bind_param_and_bind_attributeRafael França2017-05-0311-51/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Extract `bind_param` and `bind_attribute` into `ActiveRecord::TestCase`
| * | | | | | | Extract `bind_param` and `bind_attribute` into `ActiveRecord::TestCase`Ryuta Kamizono2017-05-0411-51/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are used in tests from anywhere.
* | | | | | | | Merge pull request #28975 from ↵Rafael França2017-05-031-9/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_duplicated_test_merging_reorders_bind_params Remove duplicated `test_merging_reorders_bind_params`
| * | | | | | | Remove duplicated `test_merging_reorders_bind_params`Ryuta Kamizono2017-05-041-9/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The same test exists in `test/cases/relation/merging_test.rb`. https://github.com/rails/rails/blob/v5.1.0/activerecord/test/cases/relation/merging_test.rb#L94-L101
* | | | | | | Merge pull request #28967 from stve/active-model-validator-kind-examplesRyuta Kamizono2017-05-031-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix ActiveModel::Validator#kind code examples