Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 51f2204

Browse files
keharperkeharper
committed
Fix merge conflicts
2 parents 47c2378 + 411bba1 commit 51f2204

File tree

75 files changed

+1763
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1763
-125
lines changed

‎.github/workflows/linter.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,20 @@ on:
2121
# Set the Job #
2222
###############
2323
jobs:
24-
25-
build:
26-
# Name the Job
27-
name: Lint Code Base
24+
mdl:
25+
name: mdl
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/checkout@v2
29+
- name: Set up Ruby
30+
uses: actions/setup-ruby@v1
31+
with:
32+
ruby-version: 2.6
33+
- name: Install mdl gem
34+
run: gem install mdl
35+
- name: Run mdl
36+
run: mdl --style=_checks/styles/style-rules-prod --ignore-front-matter --git-recurse -- .
37+
super-lint:
2838
# Set the agent to run on
2939
runs-on: ubuntu-latest
3040

‎src/_data/mde.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,19 @@ extensions:
1313
-
1414
name: Amazon Sales Channel
1515
versions:
16+
-
17+
name: 4.4.0
18+
support:
19+
2.3.0: compatible
20+
2.3.1: compatible
21+
2.3.2: compatible
22+
2.3.3: compatible
23+
2.3.4: compatible
24+
2.3.5-p1: compatible
25+
2.3.6: compatible
26+
2.4.0: compatible
27+
2.4.1: supported
28+
2.4.2: supported
1629
-
1730
name: 4.3.0
1831
support:

‎src/_data/toc/community.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ pages:
1818
url: /community/resources/multi-repo-docs.html
1919
versionless: true
2020

21+
- label: Contribution Day Organizer's Handbook
22+
url: /community/resources/contribution-day-organizer-handbook.html
23+
versionless: true

‎src/_data/toc/frontend-developer-guide.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ pages:
9999
- label: Email templates
100100
url: /frontend-dev-guide/templates/template-email.html
101101

102+
- label: Email templates layout handle
103+
url: /frontend-dev-guide/templates/template-email-layout-handle.html
104+
102105
- label: Cascading style sheets (CSS)
103106
url: /frontend-dev-guide/css-topics/css-overview.html
104107
children:

‎src/_data/whats-new.yml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,32 @@ description: This page contains recent changes that we think you'd like to know
44
We exclude from this list proofreading, spelling checks, and all minor updates.
55
link: "/whats-new.html"
66
thread: "/whatsnew-feed.xml"
7-
updated: Mon Mar 1 10:21:06 2021
7+
updated: Tue Mar 9 13:48:07 2021
88
entries:
9+
- description: Added the "Remove the Integration" section in the [GitHub Integration](https://devdocs.magento.com/cloud/integrations/github-integration.html)
10+
topic.
11+
versions: 2.x
12+
type: Technical
13+
date: March 9, 2021
14+
link: https://github.com/magento/devdocs/pull/8554
15+
contributor: SumanPitta
16+
profile: https://github.com/SumanPitta
17+
- description: Added a [new table](https://devdocs.magento.com/release/commerce-features.html)
18+
comparing the available features of each minor version of Magento 2.x.
19+
versions: 2.x
20+
type: New Topic
21+
date: March 3, 2021
22+
link: https://github.com/magento/devdocs/commit/d4b75de4ce72f6a07fc9ec263a096faa030d7e33
23+
contributor: dshevtsov
24+
profile: https://github.com/dshevtsov
25+
- description: Published [release notes](https://devdocs.magento.com/quality-patches/release-notes.html)
26+
for the 1.0.17 Magento Quality Patch (MQP) package release.
27+
versions: 2.x
28+
type: Major Update
29+
date: March 3, 2021
30+
link: https://github.com/magento/devdocs/pull/8770
31+
contributor: abukatar
32+
profile: https://github.com/abukatar
933
- description: Added the "Configure product video options from Magento Admin" section
1034
to the [Configure product video](https://devdocs.magento.com/guides/v2.4/frontend-dev-guide/themes/product-video.html)
1135
topic.
@@ -1060,7 +1084,7 @@ entries:
10601084
link: https://github.com/magento/devdocs/pull/7714
10611085
contributor: keharper
10621086
profile: https://github.com/keharper
1063-
- description: Added a [deprecation notice](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html#technologies-magento-can-use)
1087+
- description: Added a [deprecation notice](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html#recommended-technologies)
10641088
for Elasticsearch 6.x.
10651089
versions: 2.3.6
10661090
type: Technical
@@ -4433,7 +4457,7 @@ entries:
44334457
- description: Added information about [Elasticsearch 6](https://devdocs.magento.com/guides/v2.3/config-guide/elasticsearch/es-overview.html#es-spt-versions)
44344458
support.<br/>Added Elasticsearch 6 information to [Configure Magento to use Elasticsearch](https://devdocs.magento.com/guides/v2.3/config-guide/elasticsearch/configure-magento.html)<br/>Added
44354459
[Change Elasticsearch Client](https://devdocs.magento.com/guides/v2.3/config-guide/elasticsearch/es-downgrade.html)
4436-
topic.<br/>Updated the [Technologies Magento can use](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html#technologies-magento-can-use)
4460+
topic.<br/>Updated the [Technologies Magento can use](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html#recommended-technologies)
44374461
topic with new Elasticsearch 6 support.
44384462
versions: 2.2.x, 2.3.x
44394463
type: Major update

‎src/_includes/config/split-deploy/example_build-sync.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ To update your build system:
1010
git pull mconfig m2.2_deploy
1111
```
1212

13-
1. Run the upgrade command:
14-
15-
```bash
16-
bin/magento setup:upgrade
17-
```
18-
1913
1. Compile code:
2014

2115
```bash

‎src/cloud/architecture/cloud-architecture.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ For comparison, each plan includes the following infrastructure features and sup
4646
<a href="{{ site.baseurl }}/cloud/project/new-relic.html">New Relic</a> APM (Performance Monitoring) on 3 branches: <code>master</code> and 2 of your choice
4747
</li>
4848
<li>Platform-as-a-service (PaaS) based Production, Staging, and development environments (4 total active environments) optimized for {{site.data.var.ee}}</li>
49+
<li>Egress filtering (outbound firewall)</li>
4950
</ul>
5051
</td>
5152
<td>

‎src/cloud/architecture/starter-architecture.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ redirect_from:
99

1010
Your {{site.data.var.ece}} Starter architecture supports up to **four** environments, including a Master environment that contains the initial project code, the Staging environment, and up to two Integration environments.
1111

12-
All environments are in PaaS (Platform-as-a-Service) containers. These containers are deployed inside highly restricted containers on a grid of servers. These environments are read-only, accepting deployed code changes from branches pushed from your local workspace. Each environment provide a database and web server.
12+
All environments are in PaaS (Platform-as-a-Service) containers. These containers are deployed inside highly restricted containers on a grid of servers. These environments are read-only, accepting deployed code changes from branches pushed from your local workspace. Each environment provides a database and web server.
1313

1414
You can use any development and branching methodology you like. When you get initial access to your project, we strongly recommend that you create a Staging environment from the Master environment. Then, create the Integration environment by branching from Staging.
1515

@@ -59,6 +59,7 @@ The Production and Staging environments include the following technologies. You
5959
- Nginx web server speaking to PHP-FPM, one instance with multiple workers
6060
- Redis server
6161
- Elasticsearch for searching for {{site.data.var.ece}} 2.2 and later
62+
- Egress filtering (outbound firewall)
6263

6364
### Services {#cloud-arch-services}
6465

‎src/cloud/integrations/bitbucket-integration.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ To create an OAuth consumer in Bitbucket:
146146
1. Verify the project integration.
147147

148148
```bash
149-
magento-cloud integrations -p '<project-ID>'
149+
magento-cloud integrations -p <project-ID>
150150
```
151151

152152
```terminal
@@ -236,11 +236,11 @@ To activate a branch created with Bitbucket:
236236
```terminal
237237
Your environments are:
238238
+---------------------+----------------+--------+
239-
| ID          | Name        | Status |
239+
| ID | Name | Status |
240240
+---------------------+----------------+--------+
241-
| master      | Master      | Active |
241+
| master | Master | Active |
242242
| integration | integration | Active |
243-
|    from-bitbucket * | from-bitbucket | Active |
243+
| from-bitbucket * | from-bitbucket | Active |
244244
+---------------------+----------------+--------+
245245
* - Indicates the current environment
246246
```
@@ -265,7 +265,7 @@ To remove the Bitbucket integration:
265265
1. Delete the integration.
266266

267267
```bash
268-
magento-cloud integration:delete <project-ID>
268+
magento-cloud integration:delete <int-ID>
269269
```
270270

271271
Also, you can remove the Bitbucket integration by logging in to your Bitbucket account and revoking the OAuth grant on the account _Settings_ page.

‎src/cloud/integrations/cloud-integrations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Created integration integration-ID (type: webhook)
112112
You can update an existing integration. For example, change the states from `complete` to `pending` using the following:
113113

114114
```bash
115-
magento-cloud integration:update --states=pending <integration-ID>
115+
magento-cloud integration:update --states=pending <int-id>
116116
```
117117

118118
Sample response:

‎src/cloud/integrations/github-integration.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,26 @@ In order to communicate events—such as a push—with your Cloud Git server, yo
151151
## Test the integration
152152
153153
To verify the integration works, make a change in the GitHub repository and use the magento-cloud CLI to pull the change into the local environment.
154+
155+
## Remove the integration
156+
157+
You can safely remove the Github integration from your project without affecting your code.
158+
159+
{:.procedure}
160+
To remove the Github integration:
161+
162+
1. From the terminal, log in to your {{site.data.var.ece}} project.
163+
164+
1. List your integrations. You need the Github integration ID to complete the next step.
165+
166+
```bash
167+
magento-cloud integration:list
168+
```
169+
170+
1. Delete the integration.
171+
172+
```bash
173+
magento-cloud integration:delete <project-ID>
174+
```
175+
176+
Also, you can remove the Github integration by logging in to your Github account and removing the web hook in the _Webhooks_ tab of the repository _Settings_.

‎src/cloud/live/stage-prod-migrate.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,18 @@ To migrate a database:
252252

253253
1. Create a database dump file in `gzip` format:
254254

255-
For Starter environments and Pro Integration environments:
256-
257255
```bash
258-
mysqldump -h <database host> --user=<database username> --password=<password> --single-transaction --triggers main | gzip - > /tmp/database.sql.gz
256+
mysqldump -h <database host> --user=<database username> --password=<password> --single-transaction --triggers <database name> | gzip - > /tmp/database.sql.gz
259257
```
260258

261-
For Pro Staging and Production environments, the name of the database is in the `MAGENTO_CLOUD_RELATIONSHIPS` variable (typically the same as the application name and username):
259+
For Starter environments and Pro Integration environments, use `main` as the name of the database.
260+
261+
For Pro Staging and Production environments, the name of the database is in the `MAGENTO_CLOUD_RELATIONSHIPS` variable (typically the same as the application name and username).
262+
263+
If you have configured two-factor authentication on the target environment, it is better to exclude related 2FA tables to avoid reconfiguring it after database migration:
262264

263265
```bash
264-
mysqldump -h <database host> --user=<database username> --password=<password> --single-transaction --triggers <database name> | gzip - > /tmp/database.sql.gz
266+
mysqldump -h <database host> --user=<database username> --password=<password> --single-transaction --triggers --ignore-table=tfa_user_config --ignore-table=tfa_country_codes <database name> | gzip - > /tmp/database.sql.gz
265267
```
266268

267269
1. Transfer the database dump to another remote environment with the `rsync` command:

0 commit comments

Comments
 (0)