Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit b82a2fa

Browse files
committed
Merge branch 'develop' into Q4-integration
2 parents 9583e61 + 11f4055 commit b82a2fa

File tree

52 files changed

+1591
-836
lines changed

Some content is hidden

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

52 files changed

+1591
-836
lines changed

_data/codebase/v2_2/open-source/bin-magento.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ commands:
359359
is_required: false
360360
is_array: true
361361
description: Space-separated list of config types or omit to dump all [scopes,
362-
system, themes, i18n]
362+
themes, system, i18n]
363363
default: []
364364
options:
365365
help:
@@ -5293,7 +5293,7 @@ commands:
52935293
is_value_required: true
52945294
is_multiple: false
52955295
description: Database server engine
5296-
default: innodb
5296+
default:
52975297
db-password:
52985298
name: "--db-password"
52995299
shortcut: ''
@@ -5317,15 +5317,15 @@ commands:
53175317
is_value_required: true
53185318
is_multiple: false
53195319
description: Database type
5320-
default: mysql4
5320+
default:
53215321
db-init-statements:
53225322
name: "--db-init-statements"
53235323
shortcut: ''
53245324
accept_value: true
53255325
is_value_required: true
53265326
is_multiple: false
53275327
description: Database initial set of commands
5328-
default: SET NAMES utf8;
5328+
default:
53295329
skip-db-validation:
53305330
name: "--skip-db-validation"
53315331
shortcut: "-s"
@@ -5611,7 +5611,7 @@ commands:
56115611
is_value_required: true
56125612
is_multiple: false
56135613
description: Lock provider name
5614-
default: db
5614+
default:
56155615
lock-db-prefix:
56165616
name: "--lock-db-prefix"
56175617
shortcut: ''
@@ -6169,7 +6169,7 @@ commands:
61696169
is_value_required: true
61706170
is_multiple: false
61716171
description: Database server engine
6172-
default: innodb
6172+
default:
61736173
db-password:
61746174
name: "--db-password"
61756175
shortcut: ''
@@ -6193,15 +6193,15 @@ commands:
61936193
is_value_required: true
61946194
is_multiple: false
61956195
description: Database type
6196-
default: mysql4
6196+
default:
61976197
db-init-statements:
61986198
name: "--db-init-statements"
61996199
shortcut: ''
62006200
accept_value: true
62016201
is_value_required: true
62026202
is_multiple: false
62036203
description: Database initial set of commands
6204-
default: SET NAMES utf8;
6204+
default:
62056205
skip-db-validation:
62066206
name: "--skip-db-validation"
62076207
shortcut: "-s"
@@ -6487,7 +6487,7 @@ commands:
64876487
is_value_required: true
64886488
is_multiple: false
64896489
description: Lock provider name
6490-
default: db
6490+
default:
64916491
lock-db-prefix:
64926492
name: "--lock-db-prefix"
64936493
shortcut: ''

_data/codebase/v2_3/open-source/bin-magento.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5688,7 +5688,7 @@ commands:
56885688
is_value_required: true
56895689
is_multiple: false
56905690
description: Database server engine
5691-
default: innodb
5691+
default:
56925692
db-password:
56935693
name: "--db-password"
56945694
shortcut: ''
@@ -5712,15 +5712,15 @@ commands:
57125712
is_value_required: true
57135713
is_multiple: false
57145714
description: Database type
5715-
default: mysql4
5715+
default:
57165716
db-init-statements:
57175717
name: "--db-init-statements"
57185718
shortcut: ''
57195719
accept_value: true
57205720
is_value_required: true
57215721
is_multiple: false
57225722
description: Database initial set of commands
5723-
default: SET NAMES utf8;
5723+
default:
57245724
skip-db-validation:
57255725
name: "--skip-db-validation"
57265726
shortcut: "-s"
@@ -6064,7 +6064,7 @@ commands:
60646064
is_value_required: true
60656065
is_multiple: false
60666066
description: Lock provider name
6067-
default: db
6067+
default:
60686068
lock-db-prefix:
60696069
name: "--lock-db-prefix"
60706070
shortcut: ''
@@ -6884,7 +6884,7 @@ commands:
68846884
is_value_required: true
68856885
is_multiple: false
68866886
description: Database server engine
6887-
default: innodb
6887+
default:
68886888
db-password:
68896889
name: "--db-password"
68906890
shortcut: ''
@@ -6908,15 +6908,15 @@ commands:
69086908
is_value_required: true
69096909
is_multiple: false
69106910
description: Database type
6911-
default: mysql4
6911+
default:
69126912
db-init-statements:
69136913
name: "--db-init-statements"
69146914
shortcut: ''
69156915
accept_value: true
69166916
is_value_required: true
69176917
is_multiple: false
69186918
description: Database initial set of commands
6919-
default: SET NAMES utf8;
6919+
default:
69206920
skip-db-validation:
69216921
name: "--skip-db-validation"
69226922
shortcut: "-s"
@@ -7260,7 +7260,7 @@ commands:
72607260
is_value_required: true
72617261
is_multiple: false
72627262
description: Lock provider name
7263-
default: db
7263+
default:
72647264
lock-db-prefix:
72657265
name: "--lock-db-prefix"
72667266
shortcut: ''

_data/toc/rest-api.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@ pages:
127127
- label: Manage prices for multiple products
128128
url: /rest/modules/catalog-pricing.html
129129
include_versions: ["2.2", "2.3"]
130+
131+
- label: Sales
132+
children:
133+
134+
- label: Refunds
135+
url: /rest/modules/sales/refunds.html
130136

131137
- label: Inventory
132138
include_versions: ["2.3"]

_data/whats-new.yml

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,61 @@ description: |
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: Tue Aug 20 11:10:17 2019
7+
updated: Mon Aug 26 22:12:19 2019
88
entries:
9+
- description: Added new code examples to the [JavaScript Mixins](https://devdocs.magento.com/guides/v2.3/javascript-dev-guide/javascript/js_mixins.html)
10+
topic.
11+
versions: 2.2.x, 2.3.x
12+
type: Major update
13+
date: August 26, 2019
14+
link: https://github.com/magento/devdocs/pull/5229
15+
- description: Added new code examples to the [Loader widget](https://devdocs.magento.com/guides/v2.3/javascript-dev-guide/widgets/widget_loader.html)
16+
topic.
17+
versions: 2.2.x, 2.3.x
18+
type: Major update
19+
date: August 26, 2019
20+
link: https://github.com/magento/devdocs/pull/5230
21+
- description: Added information about how to [retrieve dependency injection configuration
22+
information](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/build/di-xml-file.html)
23+
for a particular class.
24+
versions: 2.2.x, 2.3.x
25+
type: Major update
26+
date: August 26, 2019
27+
link: https://github.com/magento/devdocs/pull/5269
28+
- description: Added a new topic about [view models](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/module-development.html).
29+
versions: 2.2.x, 2.3.x
30+
type: New topic
31+
date: August 26, 2019
32+
link: https://github.com/magento/devdocs/pull/5147
33+
- description: Added a new topic about the [RowBuilder widget](https://devdocs.magento.com/guides/v2.2/javascript-dev-guide/widgets/widget-row-builder.html).
34+
versions: 2.2.x, 2.3.x
35+
type: New topic
36+
date: August 26, 2019
37+
link: https://github.com/magento/devdocs/pull/5206
38+
- description: Added new code examples to the [Customize Checkout](https://devdocs.magento.com/guides/v2.3/howdoi/checkout/checkout_customize.html)
39+
tutorial.
40+
versions: 2.2.x, 2.3.x
41+
type: Major update
42+
date: August 26, 2019
43+
link: https://github.com/magento/devdocs/pull/5225
44+
- description: Added a new topic about the [Breadcrumbs widget](https://devdocs.magento.com/guides/v2.3/javascript-dev-guide/widgets/widget-breadcrumbs.html).
45+
versions: 2.2.x, 2.3.x
46+
type: New topic
47+
date: August 26, 2019
48+
link: https://github.com/magento/devdocs/pull/5228
49+
- description: Added [technical guideline](https://devdocs.magento.com/guides/v2.2/coding-standards/technical-guidelines.html)–clause 5.20 about how to handle exceptions in observers and plugins.
50+
versions: 2.2.x, 2.3.x
51+
type: Major update
52+
date: August 23, 2019
53+
link: https://github.com/magento/devdocs/pull/5209
54+
- description: Updated [Magento Commerce Cloud Guide](https://devdocs.magento.com/guides/v2.3/cloud/architecture/pro-develop-deploy-workflow.html)
55+
to remove obsolete instructions for configuring legacy environments and migrating
56+
legacy Cloud environments to use the Project Web UI. Legacy environments are those
57+
provisioned prior to October 23, 2017.
58+
versions: 2.x
59+
type: Major update
60+
date: August 22, 2019
61+
link: https://github.com/magento/devdocs/pull/5125
962
- description: Added a tutorial about how to create a [grouped product using the REST
1063
API](https://devdocs.magento.com/guides/v2.3/rest/tutorials/grouped-product/create-and-manage-grouped-products.html).
1164
versions: 2.3.x

_includes/config/message-queue-consumers.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,6 @@ To view a list of all consumers:
66
bin/magento queue:consumers:list
77
```
88

9-
The list displays as follows:
10-
11-
```
12-
sharedCatalogUpdatePrice
13-
sharedCatalogUpdateCategoryPermissions
14-
quoteItemCleaner
15-
inventoryQtyCounter
16-
async.operations.all
17-
```
18-
199
## Start message queue consumers
2010

2111
To start message queue consumers:
-20.4 KB
Loading
-20.2 KB
Loading
8.38 KB
Loading
68.8 KB
Loading
8.27 KB
Loading

0 commit comments

Comments
 (0)