Merge branch '2.4.1-develop' into kh_gift-message-order

Author: keharper

.ruby-version

@@ -1 +1 @@
-ruby-2.6.5
+ruby-2.6.6

Gemfile.lock

@@ -153,7 +153,7 @@ GEM
     unicode-display_width (1.7.0)
     verbal_expressions (0.1.5)
     wdm (0.1.1)
-    whatsup_github (0.1.1)
+    whatsup_github (0.2.0)
       netrc (~> 0.10)
       octokit (~> 4.14)
       thor (~> 0.20)
@@ -163,6 +163,7 @@ PLATFORMS
   ruby
   x86-mswin32
   x86_64-darwin-18
+  x86_64-darwin-19
 
 DEPENDENCIES
   devdocs!

src/_data/codebase/cloud/cloud-error-messages.yml

@@ -0,0 +1,88 @@
+# Error message suggestions
+
+# Magento Cloud error labels and suggested solutions to include in Cloud error reference table
+
+# ENV_PHP_IS_NOT_WRITEABLE applies to errors 102 and 202
+
+ENV_PHP_IS_NOT_WRITABLE: "Deployment script cannot make required changes to the `/app/etc/env.php` file. Check your filesystem permissions."
+
+# CONFIG_NOT_DEFINED applies to errors 103 and 203
+
+CONFIG_NOT_DEFINED: "Configuration isn't defined in the `./vendor/magento/ece-tools/config/schema.yaml` file. Check that the config variable name is correct, and that it defined."
+
+# CONFIG_PARSE_FAILED applies to 4, 104, 204
+CONFIG_PARSE_FAILED: "The `./.magento.env.yaml` file format is invalid. Use a YAML parser to check the syntax and fix any errors."
+
+# CONFIG_UNABLE_TO_READ applies to 5, 105, 205
+CONFIG_UNABLE_TO_READ: "Unable to read the `./.magento.env.yaml` file. Check file permissions."
+
+CONFIG_PHP_IS_NOT_WRITABLE: "Deployment script cannot make required changes to the `/app/etc/config.php` file. Check your filesystem permissions."
+
+CANT_READ_COMPOSER_JSON: "Unable to read the `./composer.json` file. Check file permissions."
+
+COMPOSER_MISSED_REQUIRED_AUTOLOAD: "Required `autoload` section is missing from the `composer.json` file. Compare the autoload section from the Magento `composer.json` file template, and add the missing configuration."
+
+WRONG_CONFIGURATION_MAGENTO_ENV_YAML: "The `./.magento.env.yaml` file contains invalid configuration. Check the error log for detailed info."
+
+COMPOSER_DUMP_AUTOLOAD_FAILED: "The `composer dump-autoload` command failed. Check the `cloud.log` for more information."
+
+BALER_NOT_FOUND: "Check the `SCD_USE_BALER` environment variable to verify that the Baler module is configured and enabled for JS bundling. If you don't need the Baler module, set `SCD_USE_BALER: false`."
+
+#The UTILITY_NOT_FOUND_ACTION applies to the following errors: 
+#  BUILD_UTILITY_NOT_FOUND = 18
+#  DEPLOY_UTILITY_NOT_FOUND = 118
+
+UTILITY_NOT_FOUND_ACTION: "One of required utilities was not found on server. Check the `cloud.log` for more information and install required utility."
+
+# The CHECK_CLOUD_LOG_ACTION applies to the following errors:
+# SCD_COMPRESSION_FAILED = 20, 120
+# SCD_COPYING_FAILED = 21
+
+CHECK_CLOUD_LOG_ACTION: "Check the `cloud.log` for more information."
+
+WRITABLE_DIRECTORY_COPYING_FAILED: "Failed to copy writable directories into the `./init` folder. Check your filesystem permissions."
+
+CLEAN_INIT_PUB_STATIC_FAILED: "Failed to clean `./init/pub/static` folder. Check your filesystem permissions."
+
+COMPOSER_PACKAGE_NOT_FOUND: "If you installed the Magento application version directly from the Magento git repository, verify that the `DEPLOYED_MAGENTO_VERSION_FROM_GIT` environment variable is configured."
+
+WRONG_CACHE_CONFIGURATION: "Cache configuration is missing required parameters `server` or `port`. Check the `cloud.log` for more information."
+
+REDIS_CACHE_CLEAN_FAILED: "Failed to clean the Redis cache. Check that the Redis cache configuration is correct and that the Redis service is available. See [Setup Redis service](https://devdocs.magento.com/cloud/project/project-conf-files_services-redis.html)."
+
+WRONG_CONFIGURATION_DB: "Check that the the `DATABASE_CONFIGURATION` environment variable is configured correctly."
+
+WRONG_CONFIGURATION_SESSION: "Check that the `SESSION_CONFIGURATION` environment variable is configured correctly. The configuration must contain at least the `save` parameter."
+
+WRONG_CONFIGURATION_SEARCH: "Check that the `SEARCH_CONFIGURATION` environment variable is configured correctly.. The configuration must contain at least the `engine` parameter."
+
+WRONG_CONFIGURATION_RESOURCE: "Check that the `RESOURCE_CONFIGURATION` environment variable is configured correctly. The configuration must contain at least `connection` parameter."
+
+ELASTIC_SUITE_WITHOUT_ES: "ElasticSuite is installed, but the Elasticsearch service is not available. Check that the `SEARCH_CONFIGURATION` environment variable is configured correctly, and verify that the Elasticsearch service is available."
+
+ELASTIC_SUITE_WRONG_ENGINE: "ElasticSuite is installed but another search engine is configured. Update the `SEARCH_CONFIGURATION` environment variable to enable Elasticsearch and verify the Elasticsearch service configuration in the `services.yaml` file."
+
+#The INSTALL_UPGRADE_ACTION applies to the following errors: 
+#  INSTALL_COMMAND_FAILED - 116
+#  UPGRADE_COMMAND_FAILED - 126
+
+INSTALL_UPGRADE_ACTION: "Check the `cloud.log` and `install_upgrade.log` for more information. Add `VERBOSE_COMMANDS: '-vvv'` into `.magento.env.yaml` for more detailed command output."
+
+SCD_UNABLE_UPDATE_VERSION: "Cannot update `./pub/static/deployed_version.txt` file. Check your filesystem permissions."
+
+VIEW_PREPROCESSED_CLEAN_FAILED: "Unable to clean the `./var/view_preprocessed` folder. Check your filesystem permissions."
+
+FILE_CREDENTIALS_EMAIL_NOT_WRITABLE: "Failed to update the `/var/credentials_email.txt` file. Check your filesystem permissions."
+
+#The CLOUD_LOG_VERBOSE_ACTION applies to the following errors:
+
+#  MODULE_ENABLE_COMMAND_FAILED - 11
+#  SCD_FAILED - 19, 119, 
+#  MAINTENANCE_MODE_ENABLING_FAILED - 108,  
+#  CONFIG_IMPORT_COMMAND_FAILED- 117
+#  SPLIT_DB_COMMAND_FAILED - 123
+#  CACHE_FLUSH_COMMAND_FAILED - 127, 227
+
+CLOUD_LOG_VERBOSE_ACTION: "Check the `cloud.log` for more information. Add `VERBOSE_COMMANDS: '-vvv'` into `.magento.env.yaml` for more detailed command output."
+
+CACHE_ENABLE_FAILED: "Command `php ./bin/magento cache:enable` runs only when Magento was installed but `./app/etc/env.php` file was absent or empty at the beginning of the deployment. Check the `cloud.log` for more information. Add `VERBOSE_COMMANDS: '-vvv'` into `.magento.env.yaml` for more detailed command output."

src/_data/main-nav.yml

@@ -51,8 +51,8 @@
           url: /cloud/docker/docker-mftf.html
           versionless: true
 
-        - label: ECE-Tools testing
-          url: /cloud/docker/docker-development-testing.html
+        - label: Magento Cloud code testing
+          url: /cloud/docker/docker-test-magecloud-pkg-code.html
           versionless: true
 
 - label: Setup

src/_data/toc/cloud-guide.yml

@@ -57,6 +57,10 @@ pages:
           url: /cloud/env/environments-ssh.html
           versionless: true
 
+        - label: PrivateLink
+          url: /cloud/project/privatelink-service.html
+          versionless: true
+
         - label: New Relic
           url: /cloud/project/new-relic.html
           versionless: true
@@ -137,6 +141,10 @@ pages:
               url: /cloud/docker/docker-manage-database.html
               versionless: true
 
+            - label: Enable split database solution
+              url: /cloud/docker/docker-split-db.html
+              versionless: true
+
             - label: Manage cron jobs
               url: /cloud/docker/docker-manage-cron-jobs.html
               versionless: true
@@ -145,6 +153,10 @@ pages:
               url: /cloud/docker/docker-extend.html
               versionless: true
 
+            - label: Add Blackfire.io service
+              url:  /cloud/docker/docker-config-blackfire-io.html
+              versionless: true
+
         - label: Launch Docker
           children: 
             - label: Developer mode
@@ -158,11 +170,11 @@ pages:
         - label: Functional Testing
           children:
             - label: Magento application testing
-              url: /cloud/docker/docker-mftf.html
+              url: /cloud/docker/docker-test-app-mftf.html
               versionless: true
 
-            - label: ECE-Tools testing
-              url: /cloud/docker/docker-development-testing.html
+            - label: Magento Cloud code testing
+              url: /cloud/docker/docker-test-magecloud-pkg-code.html
               versionless: true
 
         - label: Docker quick reference
@@ -491,6 +503,10 @@ pages:
           url: /cloud/live/stage-prod-test.html
           versionless: true
 
+        - label: Error log message reference
+          url: /cloud/reference/error-codes.html
+          versionless: true
+
     - label: Site launch
       url: /cloud/live/live.html
       versionless: true
@@ -507,6 +523,7 @@ pages:
       url: /cloud/trouble/trouble.html
       versionless: true
       children:
+        
         - label: Troubleshoot deployment
           url: /cloud/trouble/troubleshoot-deployment.html
           versionless: true

src/_data/toc/rest-api.yml

@@ -12,15 +12,15 @@ pages:
           children:
 
             - label: Admin REST endpoints
-              url: /redoc/2.3/admin-rest-api.html
+              url: https://magento.redoc.ly/
               versionless: true
 
             - label: Customer REST endpoints
-              url: /redoc/2.3/customer-rest-api.html
+              url: https://magento.redoc.ly/
               versionless: true
 
             - label: Guest REST endpoints
-              url: /redoc/2.3/guest-rest-api.html
+              url: https://magento.redoc.ly/
               versionless: true
 
             - label: Asynchronous Admin REST endpoints

src/_data/var.yml

@@ -21,14 +21,21 @@ mbi: Magento Business Intelligence
 # Cloud product name variables
 
 ece: Magento Commerce Cloud
+ece-release-date: June 25, 2020
 csuite: Magento Commerce Cloud Suite
 ct: ece-tools
+ct-repo: magento/ece-tools
+ct-release: 2002.1.1
 mcp-prod: Magento Cloud Patches
-mcp: magento-cloud-patches
-mcd: magento-cloud-docker
+mcp-package: magento/magento-cloud-patches
+mcp-release: 1.0.5
+mcd-package: magento/magento-cloud-docker
 mcd-prod: Magento Cloud Docker
+mcd-release: 1.1.0
 mcc-prod: Magento Cloud Components
-mcc: magento-cloud-components
+mcc-package: magento/magento-cloud-components
+mcc-release: 1.0.5
+
 
 # TIP: Use the following syntax to use a variable in the documentation source: {{site.data.var.xx}} where xx
 # is the variable value.

src/_data/whats-new.yml

@@ -4,8 +4,105 @@ description:
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: /whats-new.html
 thread: /whatsnew-feed.xml
-updated: Mon Jun 15 09:55:11 2020
+updated: Wed Jun 25 15:26:35 2020
 entries:
+- description: Added [Magento Cloud Patches v 1.0.5 Release Notes](https://devdocs.magento.com/cloud/release-notes/mcc-release-notes.html).
+  versions: 2.x
+  type: Major Update
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/7411
+- description: Added [Magento Cloud Components v 1.0.4 Release Notes]( https://devdocs.magento.com/cloud/release-notes/mcc-release-notes.html).
+  versions: 2.x
+  type: Major Update
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/7412
+- description: Added an [Error message reference for ece-tools]( https://devdocs.magento.com/cloud/reference/error-codes.html)
+    with error listing and suggested actions to resolve build and deploy issues.
+  versions: 2.x
+  type: Major update
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/7327
+- description: Added the `wizard:split-db-state` command to the [Smart wizards]( https://devdocs.magento.com/cloud/deploy/smart-wizards.html)
+    topic in the _Cloud Guide_.
+  versions: 2.x
+  type: Technical
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/7322
+- description: Updated the [Deploy variables](https://devdocs.magento.com/cloud/env/variables-deploy.html) topic in the _Cloud Guide_
+    to add the `REDIS_BACKEND` environment variable to configure the Redis backend model for Redis cache for Magento 2.3.5 and later.
+  versions: 2.x
+  type: Technical
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/7194
+- description: Updated the [Import URL Rewrites](https://devdocs.magento.com/cloud/configure/import-url-rewrites.html)
+    topic with guidance about checking the PHP  file upload limit to prevent errors
+    when uploading a large file for importing URL rewrites.
+  versions: 2.x
+  type: Technical
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/7196
+- description: Added instructions to complete functional testing for Magento Cloud packages in the Docker environment.
+    See [Magento Cloud code testing](https://cloud/docker/docker-test-magecloud-pkg-code.html).
+  versions: 2.x
+  type: Technical
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/7019
+- description: Added instructions for using the Magento Baler extension
+    to bundle javascript content during the Magento Cloud build process. See [Static
+    content deployment](https://devdocs.magento.com/cloud/deploy/static-content-deployment.html).
+  versions: 2.x
+  type: Technical
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/6944
+- description: Added information about the [Cloud error log](https://devdocs.magento.com/cloud/project/log-locations.html)
+    (`var/log/Cloud.error.log`) which contains all error and warning messages from the latest deployment of the Cloud environment.
+  versions: 2.x
+  type: Technical
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/7372
+- description: Updated the [Xdebug configuration instructions]( https://devdocs.magento.com/cloud/docker/docker-development-debug.html)
+    for Magento Cloud Docker, which now requires using the `--with-xdedug` option
+    to build a container to handle Xdebug requests instead of adding the Xdebug configuration
+    to the `.magento.app.yaml` file.
+  versions: 2.x
+  type: New topic
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/7321
+- description: Added basic instructions for configuring and using Blackfire.io for
+    performance testing in a Magento Cloud Docker environment. See [Add Blackfire.io
+    to Magento Cloud Docker](https://devdocs.magento.com/cloud/docker/docker-config-blackfire-io.html).
+  versions: 2.x
+  type: New Topic
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/7335
+- description: Added an example using the `--no-varnish` option to skip Varnish container
+    installation when building a Magento Cloud Docker environment. See the [Varnish
+    container](https://devdocs.magento.com/cloud/docker/docker-containers-service.html#varnish-container)
+    topic in the _Cloud Guide_.
+  versions: 2.x
+  type: Technical
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/7294
+- description: Documented the new `es-en-var` option to customize the Elasticsearch
+    container configuration when building the Docker Compose file for a Magento Cloud
+    Docker environment. See [Elasticsearch container](https://devdocs.magento.com/cloud/docker/docker-containers-service.html#elasticsearch-container).
+  versions: 2.x
+  type: Technical
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/7282
+- description: Added instructions for running Docker on a custom host and port. See
+    [Docker configuration](https://devdocs.magento.com/cloud/docker/docker-config.html) topic in the _Cloud Guide_.
+  versions: 2.x
+  type: Technical
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/6977
+- description: Added information about the default Varnish container configuration
+    to the [Docker services containers](https://devdocs.magento.com/cloud/docker/docker-containers-service.html)
+    topic in the _Cloud Guide_.
+  versions: 2.x
+  type: Technical
+  date: June 25, 2020
+  link: https://github.com/magento/devdocs/pull/6618
 - description: Added two new REST endpoints that add support for the Inventory Management
     [In-store Pickup](https://devdocs.magento.com/guides/v2.4/rest/modules/inventory/in-store-pickup.html)
     feature.
@@ -170,9 +267,9 @@ entries:
   date: May 19, 2020
   link: https://github.com/magento/devdocs/pull/7211
 - description: Updated the [Extend Docker](https://devdocs.magento.com/cloud/docker/docker-extend.html)  topic
-    to include instructions for adding a new version of  an existing service (elasticsearch,
+    to include instructions for adding a new version of an existing service (elasticsearch,
     php, nginx, tls, varnish) to Magento Cloud Docker.
-  versions: ''
+  versions: Major update
   type: Technical
   date: May 18, 2020
   link: https://github.com/magento/devdocs/pull/7190
@@ -202,14 +299,14 @@ entries:
   link: https://github.com/magento/devdocs/pull/7199
 - description: Added Release Notes and updated Merchant Documentation for the Amazon
     Sales Channel 4.1.0 release.
-  versions: ''
+  versions: 2.x
   type: Major Update
   date: May 11, 2020
   link: https://github.com/magento/devdocs/pull/7193
 - description: Added [Bypass Fastly](https://devdocs.magento.com/cloud/cdn/fastly-vcl-bypass-to-origin.html)
     topic with instructions for creating a custom VCL snippet to bypass Fastly on
     requests from a specific IP address, URL, or URL pattern.
-  versions: ''
+  versions: Major update
   type: New Topic
   date: May 7, 2020
   link: https://github.com/magento/devdocs/pull/7159
@@ -803,7 +900,7 @@ entries:
   date: February 5, 2020
   link: https://github.com/magento/devdocs/pull/6394
 - description: Added a section about [vendor bundled extensions (VBEs)](https://devdocs.magento.com/extensions/vendor/).
-  versions: ''
+  versions: Major update
   type: New topic
   date: February 5, 2020
   link: https://github.com/magento/devdocs/pull/6521
@@ -5770,3 +5867,4 @@ entries:
   versions: 2.x
   type: New
   date: Oct 7 2016
+  

src/_includes/browsers/supported-browsers-24.md

@@ -1,5 +1,6 @@
 Storefront and Admin:
 
+*  Microsoft Edge, latest–1
 *  Firefox latest, latest–1 (any operating system)
 *  Chrome latest, latest–1 (any operating system)
 *  Safari latest, latest–1 (Mac OS only)

src/_includes/cloud/backup-db.md

@@ -31,4 +31,4 @@ To back up your Staging or Production environment database before deploying:
    vendor/bin/ece-tools db-dump
    ```
 
--  The dump operation creates a `dump-<timestamp>.sql.gz` archive file in your remote project directory. See [Snapshot and backup management]({{ site.baseurl }}/cloud/project/project-webint-snap.html#db-dump).
+   The dump operation creates a `dump-<timestamp>.sql.gz` archive file in your remote project directory. See [Snapshot and backup management]({{ site.baseurl }}/cloud/project/project-webint-snap.html#db-dump).