Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
e55f84a
Update pro-develop-deploy-workflow.md
sanjay-wagento Jan 28, 2020
a805fb4
Added missing "Full Page Cache" reference to config
markshust Feb 7, 2020
b499926
DEVDOCS-SMALL-FIXES: Fixed versions in "Example - Security patch"
andrewbess Feb 7, 2020
b4bacc0
Upgrade to latest version of Magento
Feb 7, 2020
235c952
Merge branch 'master' into UpgradeMagentoECETOOL
diazwatson Feb 7, 2020
bef3f47
Fix a typo in the Add CLI Commands page ("You module" => "Your module")
Feb 8, 2020
99bb940
🐛Fix typo NGINX
bakayolo Feb 8, 2020
be24850
note added for foreign keys
milindsingh1 Feb 10, 2020
9909747
Fixed incorrect syntax to use jQuery in mageInit options
drpayyne Feb 10, 2020
818c837
Merge pull request #6597 from bappr/patch-1
dobooth Feb 10, 2020
550f008
Merge pull request #6595 from diazwatson/UpgradeMagentoECETOOL
dobooth Feb 10, 2020
acf9b62
Update src/cloud/architecture/pro-develop-deploy-workflow.md
sanjay-wagento Feb 10, 2020
3f3b93e
Merge pull request #6589 from andrewbess/cli-upgrade-fixes
dobooth Feb 10, 2020
26c7e82
Grammar update
dobooth Feb 10, 2020
d4fcbe8
Merge pull request #6601 from milindsingh/db-schema
dobooth Feb 10, 2020
1c720c7
Fixed breadcrumb bolding.
dobooth Feb 10, 2020
4683aa7
Merge pull request #6591 from markshust/patch-5
dobooth Feb 10, 2020
62dde60
Added example response for sample query for grouped product data type…
VinothKumar361 Feb 10, 2020
f11ba0f
Merge pull request #6604 from drpayyne/patch-59
dobooth Feb 10, 2020
7a3294b
Added missing sub fields for region when setting shipping address by …
VinothKumar361 Feb 10, 2020
14877d0
Added response for sample query for bundle product data types (#6603)
VinothKumar361 Feb 10, 2020
38a5afe
Merge master
dobooth Feb 10, 2020
c4b9ea4
Merge pull request #6596 from moloughlin/fix/add_cli_spelling
dobooth Feb 10, 2020
8ff14dc
Fixed the broken link in env docs
nandhini-nagaraj Feb 11, 2020
dccf208
Updated composer.md file
erharish1989 Feb 11, 2020
18bc9fe
magento/devdocs#: Better usability. Add a link to “https://account.ma…
atwixfirster Feb 11, 2020
6de8839
Merge master
dobooth Feb 11, 2020
8ddfa7a
Merge pull request #6614 from atwixfirster/recommendations-configure-01
dobooth Feb 11, 2020
10c57c7
Merge pull request #6613 from nandhini-nagaraj/env-php/devdocs
dobooth Feb 11, 2020
b3c1448
Merge pull request #6612 from erharish1989/patch-1
dobooth Feb 11, 2020
f5eb72d
Fixed Magento min version.
barbanet Feb 11, 2020
64874f2
Merge master
dobooth Feb 11, 2020
8100eea
Merge branch 'master' of github.com:barbanet/devdocs
barbanet Feb 11, 2020
cf5b939
Fixed composer requiere command.
barbanet Feb 11, 2020
1332638
Merge master
dobooth Feb 11, 2020
3cd7a56
Merge branch 'small-changes' into master
dobooth Feb 11, 2020
1aebca4
Merge pull request #6619 from barbanet/master
dobooth Feb 11, 2020
be6e414
Sequence node added in module.xml example
chandru-199 Feb 12, 2020
e5e8317
Merge master
dobooth Feb 12, 2020
7742c4d
Sequence node added in module.xml example
chandru-199 Feb 12, 2020
eaac1bb
magento/devdocs#: Editorial. Extend setShippingAddressesOnCart exampl…
atwixfirster Feb 12, 2020
28150cf
Merge branch 'master' into patch-13
dobooth Feb 12, 2020
5443e99
Merge master
dobooth Feb 12, 2020
c2b1142
Merge pull request #6475 from sanjay-wagento/patch-13
dobooth Feb 12, 2020
5780502
Formatting
dobooth Feb 12, 2020
58153b6
Merge branch 'master' into admin-page-module-sequence-node
dobooth Feb 12, 2020
389a97b
Merge pull request #6631 from chandru-199/admin-page-module-sequence-…
dobooth Feb 12, 2020
9628aec
Remove v2.2 release notes and link refs
meker12 Feb 13, 2020
c4bedda
php versions are too old in composer.json example
chandru-199 Feb 13, 2020
7cf2394
Merge master
dobooth Feb 13, 2020
bbd6b68
Update project-conf-files_services-redis.md (#6641)
balex13 Feb 13, 2020
66d7c9c
Inventory 1.1.4 release notes.
Feb 13, 2020
1f686d4
Fixed spacing in code sample
meker12 Feb 13, 2020
8101073
Merge master
dobooth Feb 13, 2020
88bdce6
Merge pull request #6648 from magento/mae-code-sample-syntax-fixes
dobooth Feb 13, 2020
d5f2790
Merge pull request #6640 from magento/mae-remove-v22-relnotes-link-refs
dobooth Feb 13, 2020
1498fb2
Linting
dobooth Feb 13, 2020
bfd46f8
Merge branch 'master' into composer-php-version-too-old
dobooth Feb 13, 2020
35541d9
Merge master
dobooth Feb 13, 2020
cd70762
Merge pull request #6645 from chandru-199/composer-php-version-too-old
dobooth Feb 13, 2020
b25de93
Fix broken link in Cloud Guide
meker12 Feb 13, 2020
1afb6b1
Merge master
dobooth Feb 14, 2020
a2a1a60
Merge pull request #6654 from magento/mae-fix-link-syntax
dobooth Feb 14, 2020
78e6e58
Grammar
dobooth Feb 14, 2020
f078a8c
Merge branch 'master' into msi-1-1-4
dobooth Feb 14, 2020
870d70c
Merge pull request #6647 from sidolov/msi-1-1-4
dobooth Feb 14, 2020
7ddd1a7
magento/devdocs#: Add mergeCarts query API errors (#6628)
atwixfirster Feb 14, 2020
85bf6f1
Adding missing information in setBillingAddress query (#6650)
VinothKumar361 Feb 14, 2020
800b094
Merge branch 'master' into small-changes
dobooth Feb 14, 2020
b509969
Merge branch 'master' into small-changes
dobooth Feb 14, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cloud/architecture/pro-architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ The Production environment has three virtual machines (VMs) behind an Elastic Lo
- `pub/static`
- `app/etc`
- **Redis**—one server per VM with only one active and the other two as replicas
- **Elasticsearch**—search for {{site.data.var.ece}} 2.1 and later
- **Elasticsearch**—search for {{site.data.var.ece}} 2.2 and later
- **Galera**—database cluster with one MariaDB MySQL database per node with an auto-increment setting of three for unique IDs across every database

The following figure shows the technologies used in the Production environment:
Expand Down
2 changes: 1 addition & 1 deletion src/cloud/architecture/pro-develop-deploy-workflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Combine all verified code changes by merging your Active development branch into

### Merge to Staging

Staging is a pre-production environment that provides all services and settings as close to the Production environment as possible. You should always push your code changes in iterations to your Staging environment for full testing that includes all services. The first time you use the Staging environment, you must configure services, such as [Fastly CDN]({{ site.baseurl }}/cloud/cdn/cloud-fastly.html), [Blackfire Profiler]({{ site.baseurl }}/cloud/project/project-integrate-blackfire.html), and [New Relic]({{ site.baseurl }}/cloud/project/new-relic.html). Also, we recommend configuring payment gateways, shipping, notifications, and other vital services with sandbox or testing credentials.
Staging is a pre-production environment that provides all services and settings as close to the Production environment as possible. You should always push your code changes from the Integration environment to the Staging environment so that you can perform thorough testing with all services. The first time you use the Staging environment, you must configure services, such as [Fastly CDN]({{ site.baseurl }}/cloud/cdn/cloud-fastly.html), [Blackfire Profiler]({{ site.baseurl }}/cloud/project/project-integrate-blackfire.html), and [New Relic]({{ site.baseurl }}/cloud/project/new-relic.html). Also, we recommend configuring payment gateways, shipping, notifications, and other vital services with sandbox or testing credentials.

It is best to thoroughly test every service, verify your performance testing tools, and perform UAT testing as an administrator and as a customer, until you feel that your store is ready for the Production environment. See [Deploy your store]({{ site.baseurl }}/cloud/live/stage-prod-live.html).

Expand Down
2 changes: 1 addition & 1 deletion src/cloud/cdn/fastly-vcl-blocking.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ You create an Edge ACL to define the list of IP addresses to block. After creati
If you want to manage access for both Staging and Production sites, create the Edge ACL with the same name in both environments. The VCL snippet code will apply to both environments.

1. Log in to the Magento Admin.
1. Navigate to **Stores** > **Settings** > **Configuration** > **Advanced** > **System** > **Fastly Configuration**.
1. Navigate to **Stores** > Settings > **Configuration** > **Advanced** > **System** > **Full Page Cache** > **Fastly Configuration**.
1. Expand the **Edge ACL** section.
1. Click **Add ACL** to create a list. For this example, name the list "blocklist".
1. Enter IP address values in the list. Any client IPs added to this list will be blocked access from the site.
Expand Down
2 changes: 1 addition & 1 deletion src/cloud/docker/docker-containers-service.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ The FPM container includes the following volumes:
- `/app/pub/media`

{:.bs-callout-tip}
You can add custom PHP extensions and manage their status from the `runtime` section of the `.magento.app.yaml` file. See [PHP extensions]. To test custom extensions without updating the {{site.data.var.ece}} environment configuration, you can add the custom configuration to the [`docker-compose.override.yml`][Docker override] file. Configuration settings in this file are applied only when you build and deploy to the Docker environment.
You can add custom PHP extensions and manage their status from the `runtime` section of the `.magento.app.yaml` file. See [PHP extensions]. To test custom extensions without updating the {{site.data.var.ece}} environment configuration, you can add the custom configuration to the [`docker-compose.override.yml`][Docker override file]. Configuration settings in this file are applied only when you build and deploy to the Docker environment.

For additional information about configuring the php environment, see the [XDebug for Docker] documentation.

Expand Down
2 changes: 1 addition & 1 deletion src/cloud/docker/docker-containers.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ See [Docker CLI containers] for details.
| [selenium][selenium-container]| Selenium | `--with-selenium`<br>`--selenium-version`<br>`--selenium-image`| Any | Enables Magento application testing using the Magento Functional Testing Framework (MFTF)
| [tls][tls-container] | SSL Endpoint | | | Terminates SSL, can be configured to pass to varnish or nginx
| [varnish][varnish-container] | Varnish | `--varnish` | 4, 6 |
| [web][web-container] | NGNIX | `--nginx` | 1.9, latest |
| [web][web-container] | NGINX | `--nginx` | 1.9, latest |

The `ece-docker build:compose` command runs in interactive mode and verifies the configured service versions. To skip interactive mode, use the `-n, --no-interaction` option.

Expand Down
10 changes: 5 additions & 5 deletions src/cloud/project/ece-tools-upgrade-project.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ Each {{site.data.var.ee}} version requires a different constraint based on the f

You can always find the latest metapackage constraint in the [`magento-cloud` template](https://github.com/magento/magento-cloud/blob/master/composer.json).

The following example places a constraint for the {{site.data.var.ece}} metapackage to any version greater than or equal to the current version 2.2.0 and lower than next version 2.2.1:
The following example places a constraint for the {{site.data.var.ece}} metapackage to any version greater than or equal to the current version 2.3.4 and lower than next version 2.3.5:

```json
"require": {
"magento/magento-cloud-metapackage": ">=2.2.0 <2.2.1"
"magento/magento-cloud-metapackage": ">=2.3.4 <2.3.5"
},
```

Expand All @@ -46,9 +46,9 @@ To upgrade project to use ece-tools:

1. Update the `magento/magento-cloud-metapackage` version constraint in the `composer.json` file.

```bash
composer require "magento//magento-cloud-metapackage": ">=2.2.0 <2.2.1" --no-update
```
```bash
composer require "magento/magento-cloud-metapackage":">=2.3.4 <2.3.5" --no-update
```

1. Update the metapackage.

Expand Down
2 changes: 1 addition & 1 deletion src/cloud/project/project-conf-files_services-redis.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ To enable Redis:

Assuming your Redis relationship is named `redis`, you can access it using the `redis-cli` tool.

1. Use SSH to connect to the Integration environment with RabbitMQ installed and configured.
1. Use SSH to connect to the Integration environment with Redis installed and configured.

1. Open an SSH tunnel to a host.

Expand Down
12 changes: 6 additions & 6 deletions src/cloud/project/project-multi-sites.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ To configure a new web location:
```yaml
web:
locations:
"/":&app
"/": &app
# The public directory of the app, relative to its root.
root: "pub"
passthru: "/index.php"
Expand All @@ -98,7 +98,7 @@ To configure a new web location:
```yaml
web:
locations:
"/":&app
"/": &app
# The public directory of the app, relative to its root.
root: "pub"
passthru: "/index.php"
Expand Down Expand Up @@ -130,14 +130,14 @@ To configure a location with a different directory:
```yaml
web:
locations:
"/":&root
"/": &root
# The public directory of the app, relative to its root.
root: "pub"
passthru: "/index.php"
index:
- index.php
...
"/static":&static
"/static": &static
root: "pub/static"
```

Expand All @@ -146,7 +146,7 @@ To configure a location with a different directory:
```yaml
web:
locations:
"/":&root
"/": &root
# The public directory of the app, relative to its root.
root: "pub"
passthru: "/index.php"
Expand All @@ -156,7 +156,7 @@ To configure a location with a different directory:
"/media":
root: "pub/media"
...
"/static":&static
"/static": &static
root: "pub/static"
allow: true
scripts: false
Expand Down
2 changes: 1 addition & 1 deletion src/cloud/project/project-upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ To resolve the error:

[technology stack]: {{site.baseurl}}/guides/v2.3/install-gde/system-requirements-tech.html
[Upgrades and patches]: {{site.baseurl}}/cloud/project/project-upgrade-parent.html
[Magento technology stack requirements]: {{site.baseurl}}/guides/v2.2/install-gde/system-requirements-tech.html
[Magento technology stack requirements]: {{site.baseurl}}/guides/v2.3/install-gde/system-requirements-tech.html
[Configuration Management]: {{site.baseurl}}/cloud/live/sens-data-over.html
[extensions section of the .magento.app.yaml file]: {{site.baseurl}}/cloud/project/project-conf-files_magento-app.html#configure-php-options
[.magento.app.yaml]: {{site.baseurl}}/cloud/project/project-conf-files_magento-app.html
Expand Down
106 changes: 0 additions & 106 deletions src/cloud/release-notes/CloudReleaseNotes2.2.1.md

This file was deleted.

Loading