aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Permit ActionController::Parameters for serializable HashBernie Chiu2018-11-193-3/+34
|
* Merge pull request #34482 from jacobherrington/chore/add-comments-to-templatesRafael França2018-11-192-9/+8
|\ | | | | Add comments to markdown templates
| * Add comments to markdown templatesjacobherrington2018-11-182-9/+8
| |
* | Merge pull request #34453 from bogdanvlviv/exercise-connected_to-and-connects_toAaron Patterson2018-11-192-1/+36
|\ \ | | | | | | Exercise `connected_to` and `connects_to` methods
| * | Exercise `connected_to` and `connects_to` methodsbogdanvlviv2018-11-152-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since both methods are public API I think it makes sense to add these tests in order to prevent any regression in the behavior of those methods after the 6.0 release. Exercise `connected_to` - Ensure that the method raises with both `database` and `role` arguments - Ensure that the method raises without `database` and `role` Exercise `connects_to` - Ensure that the method returns an array of established connections(as mentioned in the docs of the method) Related to #34052
* | | Merge pull request #34486 from tamarr/masterRafael Mendonça França2018-11-193-3/+772
|\ \ \ | | | | | | | | | | | | allow right to left styling of docs
| * | | allow right to left styling of docs (#3)tamarr2018-11-193-3/+771
| | |/ | |/| | | | | | | * adding rtl css main file and logic to use
* | | Merge pull request #34410 from gmcgibbon/test_support_windowsEileen M. Uchitelle2018-11-193-3/+8
|\ \ \ | | | | | | | | Windows support for parallelization and instrumenter
| * | | Windows support for parallelization and instrumenterGannon McGibbon2018-11-083-3/+8
| | | | | | | | | | | | | | | | | | | | Add Windows support for `ActiveSupport::Testing::Parallelization` and `ActiveSupport::Notifications::Instrumenter`.
* | | | Merge pull request #34476 from y-yagi/fix_no_method_error_in_parallelizationEileen M. Uchitelle2018-11-192-0/+16
|\ \ \ \ | | | | | | | | | | Correctly handle unknown object in parallel tests
| * | | | Correctly handle unknown object in parallel testsyuuji.yaginuma2018-11-172-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DRb wraps in `DRbUnknown` if the data contains a type that can not be resolved locally. This can happen if an error occurs in the test and the error class can not be resolved on the server side. When this happens, an instance of `DRbUnknown` is passed to the `result` of `Server#record`. This causes another error(undefined method assertions for #<DRb::DRbUnknown:> (NoMethodError)) in `reporter.record`. This can confirm by the following steps. ``` $ rails new app -B --dev; cd app $ rails g scaffold user name:string $ edit `config.action_controller.allow_forgery_protection = true` in environments/test.rb $ bin/rails t ``` In the case of `DRbUnknown` occurs, can't resolve error exception. So wrap exception with `DRbRemoteError` in the same way as an unmarshalled object.
* | | | | Merge pull request #34483 from iguchi1124/patch-1Ryuta Kamizono2018-11-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update active_job_basics.md [ci skip]
| * | | | | [ci skip] Update active_job_basics.mdShota Iguchi2018-11-191-1/+1
|/ / / / / | | | | | | | | | | | | | | | ApplicationJob should be inherits ActiveJob::Base
* | | | | Merge pull request #34481 from jacobherrington/patch-1Gannon McGibbon2018-11-199-15/+15
|\ \ \ \ \ | |_|_|/ / |/| | | | Correct a spelling error
| * | | | Change queueing to queuing in docs and comments [skip ci]jacobherrington2018-11-189-15/+15
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My spellchecker flagged this as an incorrect spelling, upon further research it appears to be a point of contention in English. Either way might work. After further examination queuing is much more common in the Rails codebase so making this change will serve to standardize the spelling.
* | | | Fix test name to match the test behavioryuuji.yaginuma2018-11-181-4/+4
| | | | | | | | | | | | | | | | These tests are for testing the `rake` method.
* | | | Remove unused `Journey::Router::RoutingError`yuuji.yaginuma2018-11-181-3/+0
| | | | | | | | | | | | | | | | `Journey::Router::RoutingError` is no longer used since db06d128262b49c8b02e153cf95eb46f4eff364b.
* | | | Merge pull request #34475 from ↵Yuji Yaginuma2018-11-171-3/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | rmacklin/synchronize-actioncable-compiled-bundle-and-source Synchronize ActionCable JS source code with compiled bundle
| * | | Synchronize ActionCable JS source code with compiled bundleRichard Macklin2018-11-161-3/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | 30a0c7e04093add0b14be6da17c7496e7dd40e10 commited changes to the compiled bundle but not to the corresponding source files. This meant that running `yarn build` was producing untracked changes to the compiled bundle. The fix is to commit the changes to the source files so that they are in sync.
* | | Merge pull request #34464 from gmcgibbon/re_add_changes_applied_docRafael França2018-11-161-1/+3
|\ \ \ | | | | | | | | Re-add changes_applied doc
| * | | Re-add changes_applied docGannon McGibbon2018-11-161-1/+3
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #34467 from JacobEvelyn/fix-my-typoRafael França2018-11-161-3/+4
|\ \ \ \ | | | | | | | | | | Fix typo and clarify documentation
| * | | | Fix typo and clarify documentationJacob Evelyn2018-11-161-3/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | This commit fixes a small typo in documentation of the "UNLOGGED" table option for PostgreSQL databases, and clarifies the documentation slightly.
* / / / Fix cache_versioning default note (#34466)Gannon McGibbon2018-11-161-1/+1
|/ / / | | | | | | [ci skip]
* | | Merge pull request #34363 from tnantoka/docs-cache-key-note-5-2Gannon McGibbon2018-11-161-3/+3
|\ \ \ | | | | | | | | Replace `cache_key` with `cache_key_with_version` on caching_with_rails in Caching with Rails guide [ci skip]
| * | | Replace cache_key with cache_key_with_version on caching_with_rails guides ↵tnantoka2018-11-161-3/+3
|/ / / | | | | | | | | | [ci skip]
* | | Arel: Implemented DB-aware NULL-safe comparison (#34451)Dmytro Shteflyuk2018-11-1523-1/+492
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Arel: Implemented DB-aware NULL-safe comparison * Fixed where clause inversion for NULL-safe comparison * Renaming "null_safe_eq" to "is_not_distinct_from", "null_safe_not_eq" to "is_distinct_from" [Dmytro Shteflyuk + Rafael Mendonça França]
* | | Merge pull request #34457 from NARKOZ/fix-method-callRyuta Kamizono2018-11-151-1/+1
|\ \ \ | | | | | | | | Fix a method call in bin/setup file
| * | | Fix a method call in bin/setup fileNihad Abbasov2018-11-151-1/+1
|/ / / | | | | | | | | | Follow up to a725539de677adbea0ced19d65647e975dbd3f84
* | | Merge pull request #34450 from mtsmfm/add-testRafael França2018-11-141-0/+10
|\ \ \ | |_|/ |/| | Add test for normalizing non-unicode string
| * | Add test for normalizing non-unicode stringFumiaki MATSUSHIMA2018-11-151-0/+10
| | | | | | | | | | | | Closes #34062
* | | Merge pull request #34446 from alphaappsinc/masterRafael França2018-11-141-3/+4
|\ \ \ | |/ / |/| | Allow patching polling interval logarithmic multiplier
| * | Allow patching polling interval logarithmic multiplierHusam Bilal2018-11-141-3/+4
|/ /
* | Merge pull request #34444 from esparta/fix_typo_association_basicsRyuta Kamizono2018-11-141-1/+1
|\ \ | | | | | | fix typo on association_basics.md [ci skip]
| * | fix typo on association_basics.md [ci skip]Espartaco Palma2018-11-141-1/+1
|/ /
* | Merge pull request #34341 from gmcgibbon/parse_error_rescue_2Rafael França2018-11-138-8/+95
|\ \ | | | | | | Allow rescue from parse errors
| * | Allow rescue from parameter parse errorsGannon McGibbon2018-11-138-8/+95
| | | | | | | | | | | | [Gannon McGibbon + Josh Cheek]
* | | Merge pull request #34441 from mcary/document-dependent-effectsRafael França2018-11-131-0/+2
|\ \ \ | |/ / |/| | Describe how has_many's :dependent option affects #delete
| * | Describe how has_many's :dependent option affects #deleteMarcel M. Cary2018-11-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was puzzled about why `collection=` was destroying the removed records on an association with `dependent: :destroy`, even after consulting the documentation for that option. I had to dive into the Active Record source to understand what was going on: eventually `collection=` calls `collection.delete` on the ousted records, and it also uses the `:dependent` option to decide how to remove records. It would have helped me to have mention of this in the documentation for `:dependent`, not just under `collection.delete` (which I found much later). Briefly mention the broader impacts of `:dependent` in the Association Basics guide. [ci skip]
* | | Merge pull request #34400 from gmcgibbon/rm_autoload_app_javascriptsRafael França2018-11-134-10/+34
|\ \ \ | |/ / |/| | Remove asset paths from autoload_paths
| * | Remove asset paths from eager_load_paths and autoload_pathsGannon McGibbon2018-11-094-10/+34
| | | | | | | | | | | | | | | Remove `app/assets` and `app/javascript` from `eager_load_paths` and `autoload_paths`.
* | | Merge pull request #34437 from kbrock/union_all_parenRafael Mendonça França2018-11-134-42/+41
|\ \ \ | | | | | | | | | | | | Fix: Arel now emits a single pair of parens for UNION and UNION ALL
| * | | Emit single pair of parens for UNION and UNION ALLKeenan Brock2018-11-134-42/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql has a great implementation to suppress multiple parens for union sql statements. This moves that functionality to the generic implementation This also introduces that functionality for UNION ALL
* | | | Merge pull request #34411 from N0xFF/masterRafael França2018-11-133-2/+37
|\ \ \ \ | | | | | | | | | | Reset Capybara sessions if failed system test screenshot raising an exception
| * | | | Reset sessions on failed system test screenshotMaxim Perepelitsa2018-11-133-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | Reset Capybara sessions if `take_failed_screenshot` raise exception in system test `after_teardown`.
* | | | | Merge pull request #34436 from gmcgibbon/fix_default_max_bind_length_sqliteRafael França2018-11-132-0/+26
|\ \ \ \ \ | |_|/ / / |/| | | | Adjust bind length of SQLite to default (999)
| * | | | Adjust bind length of SQLite to default (999)Gannon McGibbon2018-11-132-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Change `#bind_params_length` in SQLite adapter to return the default maximum amount (999). See https://www.sqlite.org/limits.html
* | | | | Merge pull request #34429 from ↵Rafael França2018-11-131-3/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/ensure-that-connected_to-establish_connection Ensure that `ActiveRecord::Base#connected_to` with `:database` establishes connection
| * | | | | Ensure that `ActiveRecord::Base#connected_to` with `:database` establishes ↵bogdanvlviv2018-11-121-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection Related to #34052
* | | | | | Merge pull request #34221 from JacobEvelyn/allow-postgres-unlogged-test-tablesRafael França2018-11-136-1/+118
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add support for UNLOGGED Postgresql tables