Merge branch 'master' into cart-query-error-coverage

Author: dobooth

.github/ISSUE_TEMPLATE/NEW_FEATURE.md

@@ -36,4 +36,3 @@ Issues that do not comply with our Code of Conduct or do not contain enough info
 
 Feel free to remove this section before creating this issue.
 -->
-

.github/workflows/linter.yml

@@ -11,18 +11,11 @@ name: Lint Code Base
 # https://help.github.com/en/articles/workflow-syntax-for-github-actions
 #
 
-#############################
-# Start the job on all push #
-#############################
+###################################
+# Start the job on a pull request #
+###################################
 on:
-  pull_request:
-    branches:
-      - master
-      - 2.*-develop
-    paths-ignore:
-      - '**.md'
-      - '**.html'
-      - '**.xml'
+  pull_request
 
 ###############
 # Set the Job #
@@ -54,4 +47,5 @@ jobs:
           VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: master
           VALIDATE_HTML: false
-          VALIDATE_MARKDOWN: false
+          VALIDATE_OPENAPI: false
+          MARKDOWN_CONFIG_FILE: .markdownlint.json

.github/workflows/main.yml

@@ -13,7 +13,7 @@ content_map:
 -
   directory: src/mftf/v2
   repository: magento/magento2-functional-testing-framework
-  branch: 2.6.5
+  branch: 2.x-develop
   filter: true
 -
   directory: src/page-builder

Docfile.yml

@@ -15,7 +15,7 @@ This site is built by [Jekyll](https://jekyllrb.com/), which is an open-source t
 You can build the site locally in the following ways:
 
 -  [Installing the project dependencies locally](#build-locally) (Mac, Linux)
--  [Using Docker (docker-compose)](#docker-docker-compose) (Mac, Linux, Windows)
+-  [Using Docker (docker-compose)](https://github.com/magento/devdocs/wiki/Build-DevDocs-with-Docker) (Mac, Linux, Windows)
 -  [Using a Vagrant virtual machine](https://github.com/magento-devdocs/vagrant-for-magento-devdocs) (Mac, Linux, Windows)
 -  [Build DevDocs in Windows](https://github.com/magento/devdocs/wiki/Build-DevDocs-in-Windows) (Windows 7 & 10)
 -  [Building older versions of the documentation](https://github.com/magento/devdocs/wiki/Build-DevDocs-with-Docker)

README.md

@@ -78,13 +78,14 @@ task :whatsnew do
   print 'Generating data for the What\'s New digest: $ '.magenta
 
   # Generate tmp/whats-new.yml
-  if since.nil? || since.empty?
-    sh 'bin/whatsup_github', 'since', last_update
-  elsif since.is_a? String
-    sh 'bin/whatsup_github', 'since', since
-  else
-    abort 'The "since" argument must be a string. Example: "jul 4"'
-  end
+  report =
+    if since.nil? || since.empty?
+      `bin/whatsup_github since '#{last_update}'`
+    elsif since.is_a? String
+      `bin/whatsup_github since #{since}`
+    else
+      abort 'The "since" argument must be a string. Example: "jul 4"'
+    end
 
   # Merge generated tmp/whats-new.yml with existing src/_data/whats-new.yml
   generated_data = YAML.load_file generated_file
@@ -94,6 +95,9 @@ task :whatsnew do
 
   puts "Writing updates to #{current_file}"
   File.write current_file, current_data.to_yaml
+
+  abort report if report.include? 'MISSING whatsnew'
+  puts report
 end
 
 desc 'Generate index for Algolia'

Rakefile

@@ -33,7 +33,7 @@
     if url_ignore
       url_ignore.push(jekyll_excludes_as_regex).flatten!.uniq!
     else
-      checks_config['html-proofer'].merge!(url_ignore: jekyll_excludes_as_regex)
+      checks_config['html-proofer'][:url_ignore] = jekyll_excludes_as_regex
     end
 
     # Read configuration options for html-proofer

_checks/html_check_hook.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+# To enable this plugin, add to your '_config.local.yml' the following:
+#
+# debug: site_post_render
+#
+# This plugin runs an IRB session (https://github.com/ruby/irb) of a Jekyll application in a serving mode when it's at a state after rendering the whole site, but before writing any files.
+# See the ":site, :post_render" hook: https://jekyllrb.com/docs/plugins/hooks/
+# Available objects to explore are 'site' and 'payload'.
+#
+# Several helpful methods (to use a method, chain to an object such as 'site.methods', 'payload.keys'):
+# - '.methods.sort'
+# - '.instance_variables.sort'
+# - '.keys.sort'
+#
+# Examples:
+#
+# To view available configuration data of the site
+# > payload.site.keys
+#
+# To view the number of pages:
+# > payload.site.pages.count
+#
+# To find a page by path and view its data:
+# > page = payload.site.pages.select { |page| page.path == 'cloud/env/variables-build.md' }[0]
+# > page.data
+#
+# To exit from the IRB session:
+# > exit!
+#
+Jekyll::Hooks.register :site, :post_render do |site, payload|
+  next unless site.config['serving']
+
+  # rubocop:disable Lint/Debugger
+  binding.irb if site.config['debug'] == 'site_post_render'
+  # rubocop:enable Lint/Debugger
+end

_plugins/debug/site_post_render.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+# To enable this plugin, add to your '_config.local.yml' the following:
+#
+# debug: site_pre_render
+#
+# This plugin runs an IRB session (https://github.com/ruby/irb) of a Jekyll application in a serving mode when it's at a state just before rendering the whole site.
+# See the ":site, :pre_render" hook: https://jekyllrb.com/docs/plugins/hooks/
+# Available objects to explore are 'site' and 'payload'.
+#
+# Several helpful methods (to use a method, chain to an object such as 'site.methods', 'payload.keys'):
+# - '.methods.sort'
+# - '.instance_variables.sort'
+# - '.keys.sort'
+#
+# Examples:
+#
+# To view available configuration data of the site
+# > payload.site.keys
+#
+# To view the number of pages:
+# > payload.site.pages.count
+#
+# To find a page by path and view its data:
+# > page = payload.site.pages.select { |page| page.path == 'cloud/env/variables-build.md' }[0]
+# > page.data
+#
+# To exit from the IRB session:
+# > exit!
+#
+Jekyll::Hooks.register :site, :pre_render do |site, payload|
+  next unless site.config['serving']
+
+  # rubocop:disable Lint/Debugger
+  binding.irb if site.config['debug'] == 'site_pre_render'
+  # rubocop:enable Lint/Debugger
+end

_plugins/debug/site_pre_render.rb

@@ -2,7 +2,7 @@ version: '3.6'
 
 services:
   jekyll:
-    image: jekyll/jekyll:latest
+    image: jekyll/jekyll:3.8.6
     command: jekyll serve --watch --incremental --open-url --livereload
     ports:
       - 4000:4000

docker-compose.yaml

@@ -20,4 +20,4 @@ content: "## Overview\n\nThe Magento_BundleNegotiableQuote module enables bundle
   \n[The Magento dependency injection mechanism](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/depend-inj.html)
   enables you to override the functionality of the Magento_BundleNegotiableQuote module.\n\n##
   Additional information\n \nYou can track [backward incompatible changes made in
-  a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html).\n"
+  a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html)."

src/_data/codebase/v2_3/mrg/b2b/BundleNegotiableQuote.yml

@@ -17,4 +17,4 @@ content: "## Overview\n\nThe Magento_BundleRequisitionList module enables bundle
   \n### Layouts\n \nYou can extend and override layouts in the `Magento\\BundleRequisitionList\\view\\frontend\\layout`
   directories.\n\nFor more information about layouts, see the [Layout documentation](http://devdocs.magento.com/guides/v2.2/frontend-dev-guide/layouts/layout-overview.html).\n\n##
   Additional information\n \nYou can track [backward incompatible changes made in
-  a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html).\n"
+  a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html)."

src/_data/codebase/v2_3/mrg/b2b/BundleRequisitionList.yml

@@ -4,7 +4,7 @@ source_repo: magento2b2b
 release: 1.1.6
 github_path: app/code/Magento/CheckoutAddressSearchNegotiableQuote/README.md
 last_modified_at: '2019-04-10 17:47:51 -0500'
-content: |
+content: |-
   ## CheckoutAddressSearchNegotiableQuote module Overview
 
   CheckoutAddressSearchNegotiableQuote module extends Magento_CheckoutAddressSearch if it is enabled in configuration and it modifies NegotiableQuote shipping address on checkout.

src/_data/codebase/v2_3/mrg/b2b/CheckoutAddressSearchNegotiableQuote.yml

@@ -4,7 +4,7 @@ source_repo: magento2b2b
 release: 1.1.6
 github_path: app/code/Magento/CheckoutAgreementsNegotiableQuote/README.md
 last_modified_at: '2019-08-16 15:20:08 -0500'
-content: |
+content: |-
   ## CheckoutAgreementsNegotiableQuote module Overview
 
   CheckoutAgreementsNegotiableQuote module extends CheckoutAgreements if it is enabled in configuration and it adds agreements to payment data on checkout with negotiable quote.

src/_data/codebase/v2_3/mrg/b2b/CheckoutAgreementsNegotiableQuote.yml

@@ -20,4 +20,4 @@ content: "## Overview\n\nThe Magento_ConfigurableNegotiableQuote module enables
   \n[The Magento dependency injection mechanism](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/depend-inj.html)
   enables you to override the functionality of the Magento_ConfigurableNegotiableQuote
   module.\n\n## Additional information\n \nYou can track [backward incompatible changes
-  made in a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html).\n"
+  made in a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html)."

src/_data/codebase/v2_3/mrg/b2b/ConfigurableNegotiableQuote.yml

@@ -17,4 +17,4 @@ content: "## Overview\n\nThe Magento_ConfigurableRequisitionList module enables
   Layouts\n \nYou can extend and override layouts in the `Magento\\ConfigurableRequisitionList\\view\\frontend\\layout`
   directories.\n\nFor more information about layouts, see the [Layout documentation](http://devdocs.magento.com/guides/v2.2/frontend-dev-guide/layouts/layout-overview.html).\n\n##
   Additional information\n \nYou can track [backward incompatible changes made in
-  a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html).\n"
+  a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html)."

src/_data/codebase/v2_3/mrg/b2b/ConfigurableRequisitionList.yml

@@ -4,7 +4,7 @@ source_repo: magento2b2b
 release: 1.1.6
 github_path: app/code/Magento/GiftCardNegotiableQuote/README.md
 last_modified_at: '2017-04-10 10:33:01 +0300'
-content: |
+content: |-
   ## Overview
 
   The Magento_GiftCardNegotiableQuote module enables gift cards to be displayed in a negotiable quote in an B2B environment. This module extends Magento_NegotiableQuote and Magento_GiftCard modules.

src/_data/codebase/v2_3/mrg/b2b/GiftCardNegotiableQuote.yml

@@ -15,4 +15,4 @@ content: "## Overview\n\nThe Magento_GiftCardRequisitionList module enables gift
   at any time.\n\n## Structure\n\n[Learn about a typical file structure for a Magento
   2 module](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/build/module-file-structure.html).\n\n##
   Additional information\n\nYou can track [backward incompatible changes made in a
-  Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html).\n"
+  Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html)."

src/_data/codebase/v2_3/mrg/b2b/GiftCardRequisitionList.yml

@@ -27,4 +27,4 @@ content: "## Overview\n\nThe Magento_GiftCardSharedCatalog module enables gift c
   `Magento\\GiftCardSharedCatalog\\view\\adminhtml\\ui_component` - renderer for pricing
   and structure listings\n\nFor more information, see [UI Listing/Grid Component](http://devdocs.magento.com/guides/v2.2/ui-components/ui-listing-grid.html).\n\n##
   Additional information\n\nYou can track [backward incompatible changes made in a
-  Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html).\n"
+  Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html)."

src/_data/codebase/v2_3/mrg/b2b/GiftCardSharedCatalog.yml

@@ -23,4 +23,4 @@ content: "## Overview\n\nThe Magento_GroupedRequisitionList module enables group
   module.\n\n### Layouts\n \nYou can extend and override layouts in the `Magento\\GroupedRequistionList\\view\\frontend\\layout`
   directories.\n\nFor more information about layouts, see the [Layout documentation](http://devdocs.magento.com/guides/v2.2/frontend-dev-guide/layouts/layout-overview.html).\n\n##
   Additional information\n \nYou can track [backward incompatible changes made in
-  a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html).\n"
+  a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html)."

src/_data/codebase/v2_3/mrg/b2b/GroupedRequisitionList.yml

@@ -42,4 +42,4 @@ content: "## Overview\n\nThe Magento_SharedCatalog modules defines the visibilit
   more information, see [UI Listing/Grid Component](http://devdocs.magento.com/guides/v2.2/ui-components/ui-listing-grid.html)
   and [UI Form Component](http://devdocs.magento.com/guides/v2.2/ui_comp_guide/components/ui-form.html).\n\n##
   Additional information\n \nYou can track [backward incompatible changes made in
-  a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html).\n"
+  a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html)."

src/_data/codebase/v2_3/mrg/b2b/SharedCatalog.yml

@@ -4,7 +4,7 @@ source_repo: magento2ce
 release: 2.3.6
 github_path: app/code/Magento/AdminNotification/README.md
 last_modified_at: '2019-08-19 00:16:18 +0100'
-content: |
+content: |-
   The Magento_AdminNotification module provides the ability to alert administrators via system messages and provides a message inbox for surveys and notifications.
 
   ## Installation details

src/_data/codebase/v2_3/mrg/ce/AdminNotification.yml

@@ -4,7 +4,7 @@ source_repo: magento2ce
 release: 2.3.6
 github_path: app/code/Magento/AmqpStore/README.md
 last_modified_at: '2019-08-27 01:59:34 +0100'
-content: |
+content: |-
   The Magento_AmqpStore module provides the ability to specify a store before publishing messages with the Advanced Message Queuing Protocol (AMQP).
 
   ## Extensibility

src/_data/codebase/v2_3/mrg/ce/AmqpStore.yml

@@ -4,7 +4,7 @@ source_repo: magento2ce
 release: 2.3.6
 github_path: app/code/Magento/Analytics/README.md
 last_modified_at: '2019-09-15 22:49:37 +0100'
-content: |
+content: |-
   The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.3/advanced-reporting/modules.html) functionality.
 
   The module implements the following functionality:

src/_data/codebase/v2_3/mrg/ce/Analytics.yml

@@ -25,4 +25,4 @@ content: "This component is designed to provide a response for a client that lau
   `bulk_details_form`\n- `bulk_details_form_modal`\n- `bulk_listing`\n- `failed_operation_listing`\n-
   `failed_operation_modal_listing`\n- `notification_area`\n- `retriable_operation_listing`\n-
   `retriable_operation_modal_listing`\n\nFor information about UI components in Magento
-  2, see [Overview of UI components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).\n"
+  2, see [Overview of UI components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html)."

src/_data/codebase/v2_3/mrg/ce/AsynchronousOperations.yml

@@ -4,7 +4,7 @@ source_repo: magento2ce
 release: 2.3.6
 github_path: app/code/Magento/Authorization/README.md
 last_modified_at: '2019-08-25 07:43:56 +0100'
-content: |
+content: |-
   The Magento_Authorization module enables management of access control list roles and rules in the application.
 
   ## Installation details

src/_data/codebase/v2_3/mrg/ce/Authorization.yml

@@ -26,4 +26,4 @@ content: "The Magento_Authorizenet module implements the integration with the Au
   module introduces the following layouts and layout handles in the `view/frontend/layout`
   directory:\n\n- `authorizenet_directpost_payment_backendresponse`\n- `authorizenet_directpost_payment_redirect`\n-
   `authorizenet_directpost_payment_response`\n\nFor more information about layouts
-  in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).\n"
+  in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html)."

src/_data/codebase/v2_3/mrg/ce/Authorizenet.yml

@@ -4,7 +4,7 @@ source_repo: magento2ce
 release: 2.3.6
 github_path: app/code/Magento/AuthorizenetAcceptjs/README.md
 last_modified_at: '2019-08-28 00:26:17 +0100'
-content: |
+content: |-
   The Magento_AuthorizenetAcceptjs module implements the integration with the Authorize.Net payment gateway and makes the latter available as a payment method in Magento.
 
   ## Installation details

src/_data/codebase/v2_3/mrg/ce/AuthorizenetAcceptjs.yml

@@ -16,4 +16,4 @@ content: "Use the Magento_AuthorizenetCardinal module to enable 3D Secure 2.0 su
   enables you to override the functionality of the Magento_AuthorizenetCardinal module.\n\n###
   Events\n   \nThis module observes the following events:\n\n- `payment_method_assign_data_authorizenet_acceptjs`
   event in the `Magento\\AuthorizenetCardinal\\Observer\\DataAssignObserver` file.\n\nFor
-  information about an event in Magento 2, see [Events and observers](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events).\n"
+  information about an event in Magento 2, see [Events and observers](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events)."

src/_data/codebase/v2_3/mrg/ce/AuthorizenetCardinal.yml

@@ -4,7 +4,7 @@ source_repo: magento2ce
 release: 2.3.6
 github_path: app/code/Magento/AuthorizenetGraphQl/README.md
 last_modified_at: '2019-08-28 00:38:47 +0100'
-content: |
+content: |-
   The Magento_AuthorizenetGraphQl module defines the data types needed to pass payment information data from the client to Magento.
 
   ## Extensibility

src/_data/codebase/v2_3/mrg/ce/AuthorizenetGraphQl.yml

@@ -4,7 +4,7 @@ source_repo: magento2ce
 release: 2.3.6
 github_path: app/code/Magento/Backend/README.md
 last_modified_at: '2019-09-15 23:59:05 +0100'
-content: |
+content: |-
   The Magento_Backend module contains common infrastructure and assets for other modules to be defined and used in their
   administration user interface (UI).
 

src/_data/codebase/v2_3/mrg/ce/Backend.yml

@@ -16,4 +16,4 @@ content: "The Magento_Backup module allows administrators to perform backups and
   directory:   \n\n`backup_index_block`\n`backup_index_disabled`\n`backup_index_grid`\n`backup_index_index`\n\nFor
   more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).\n\n##
   Additional information\n\nFor information about significant changes in patch releases,
-  see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).\n"
+  see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)."

src/_data/codebase/v2_3/mrg/ce/Backup.yml

@@ -4,7 +4,7 @@ source_repo: magento2ce
 release: 2.3.6
 github_path: app/code/Magento/Braintree/README.md
 last_modified_at: '2019-09-23 14:26:40 -0500'
-content: |
+content: |-
   The Magento_Braintree module implements integration with the Braintree payment system.
 
   ## Extensibility

src/_data/codebase/v2_3/mrg/ce/Braintree.yml

@@ -4,7 +4,7 @@ source_repo: magento2ce
 release: 2.3.6
 github_path: app/code/Magento/BraintreeGraphQl/README.md
 last_modified_at: '2019-09-30 15:26:35 +0100'
-content: |
+content: |-
   The Magento_BraintreeGraphQl module provides type and resolver information for the GraphQL module to pass payment information data from the client to Magento.
 
   ## Extensibility

src/_data/codebase/v2_3/mrg/ce/BraintreeGraphQl.yml

@@ -4,6 +4,6 @@ source_repo: magento2ce
 release: 2.3.6
 github_path: app/code/Magento/Bundle/README.md
 last_modified_at: '2014-12-12 12:14:06 -0800'
-content: |
+content: |-
   Magento_Bundle module introduces new product type in the Magento application named Bundle Product.
   This module is designed to extend existing functionality of Magento_Catalog module by adding new product type.