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

Commit 66cbeab

Browse files
authored
Merge branch 'master' into maintainer-handbook
2 parents c39e459 + 475c8b7 commit 66cbeab

File tree

6 files changed

+74
-20
lines changed

6 files changed

+74
-20
lines changed

.github/workflows/linter.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,6 @@ jobs:
4747
VALIDATE_ALL_CODEBASE: false
4848
DEFAULT_BRANCH: master
4949
VALIDATE_HTML: false
50+
VALIDATE_JSCPD: false
5051
VALIDATE_OPENAPI: false
5152
MARKDOWN_CONFIG_FILE: .markdownlint.json

src/cloud/project/magento-app-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ This example shows the default web configuration for a Cloud project configured
146146
Defines the persistent disk size of the application in MB.
147147

148148
```yaml
149-
disk: 2048
149+
disk: 5120
150150
```
151151

152152
The minimal recommended disk size is 256MB. If you see the error `UserError: Error building the project: Disk size may not be smaller than 128MB`, increase the size to 256MB.

src/cloud/project/services-mysql.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ MariaDB 10.1 is the last version that support XtraDB as the storage engine. Vers
2525
```yaml
2626
mysql:
2727
type: mysql:<version>
28-
disk: 2048
28+
disk: 5120
2929
```
3030
3131
{:.bs-callout-tip}
@@ -69,8 +69,8 @@ If no endpoints are defined, a single endpoint named `mysql` has `admin` access
6969

7070
```yaml
7171
mysql:
72-
type: mysql:10.2
73-
disk: 2048
72+
type: mysql:10.3
73+
disk: 5120
7474
configuration:
7575
schemas:
7676
- main

src/cloud/project/services.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ You can view default versions and disk values in the current, [default `services
3333
```yaml
3434
mysql:
3535
type: mysql:<version>
36-
disk: 2048
36+
disk: 5120
3737

3838
redis:
3939
type: redis:<version>
@@ -88,7 +88,7 @@ The `type` value specifies the service name and version. For example:
8888

8989
```yaml
9090
mysql:
91-
type: mysql:10.2
91+
type: mysql:10.3
9292
```
9393

9494
Use [`Service versions`](#service-versions) table to see supported services and their versions
@@ -99,8 +99,8 @@ The `disk` value specifies the size of the persistent disk storage (in MB) to al
9999

100100
```yaml
101101
mysql:
102-
type: mysql:10.2
103-
disk: 2048
102+
type: mysql:10.3
103+
disk: 5120
104104
```
105105

106106
The current default storage amount per project is 5GB, or 5120MB. You can distribute this amount between your application and each of its services.
@@ -138,7 +138,7 @@ To verify relationships in local environment:
138138
database:
139139
-
140140
...
141-
type: 'mysql:10.2'
141+
type: 'mysql:10.3'
142142
port: 3306
143143
```
144144

@@ -218,7 +218,7 @@ You can upgrade the installed service version by updating the service configurat
218218
```yaml
219219
mysql:
220220
type: mysql:10.3
221-
disk: 2048
221+
disk: 5120
222222
```
223223

224224
1. Add, commit, and push your code changes.
@@ -260,15 +260,15 @@ To downgrade a service version by renaming an existing service:
260260
```yaml
261261
mysql:
262262
type: mysql:10.4
263-
disk: 2048
263+
disk: 5120
264264
```
265265

266266
> New `services.yaml` definition
267267

268268
```yaml
269269
mysql2:
270270
type: mysql:10.3
271-
disk: 2048
271+
disk: 5120
272272
```
273273

274274
1. Update the relationships in the `.magento.app.yaml` file.
@@ -299,10 +299,10 @@ To downgrade a service by creating an additional service:
299299
```yaml
300300
mysql:
301301
type: mysql:10.4
302-
disk: 2048
302+
disk: 5120
303303
mysql2:
304304
type: mysql:10.3
305-
disk: 2048
305+
disk: 5120
306306
```
307307

308308
1. Change the relationships configuration in the `.magento.app.yaml` file to use the new service.

src/guides/v2.3/javascript-dev-guide/widgets/widget_gallery.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,3 +580,56 @@ api.updateOptions([{
580580
[Fotorama widget]: http://fotorama.io/
581581
[lib/web/mage/gallery/gallery.js]: {{ site.mage2bloburl }}/{{ page.guide_version }}/lib/web/mage/gallery/gallery.js
582582
[lib/web/magnifier/magnify.js]: {{ site.mage2bloburl }}/{{ page.guide_version }}/lib/web/magnifier/magnify.js
583+
584+
## Code sample
585+
586+
This example shows a use case for a gallery widget on any page:
587+
588+
```html
589+
<div class="image-gallery"></div>
590+
591+
<script>
592+
require ([
593+
'jquery',
594+
'mage/gallery/gallery'
595+
], function ($, gallery) {
596+
$(function () {
597+
$('.image-gallery').each(function (index, element) {
598+
gallery({
599+
options: {
600+
"nav": "false",
601+
"loop": "true",
602+
"arrows": "true"
603+
},
604+
data: [
605+
{ img: "<image_url_1>" },
606+
{ img: "<image_url_2>" },
607+
{ img: "<image_url_3>" }
608+
],
609+
fullscreen: {
610+
"navdir": "horizontal"
611+
},
612+
"breakpoints": {
613+
"<breakpoint_name>": {
614+
"conditions": {
615+
"max-width": "767px"
616+
},
617+
"options": {}
618+
}
619+
}
620+
}, element);
621+
});
622+
});
623+
});
624+
</script>
625+
```
626+
627+
The breakpoints options are set in the `view.xml` configuration file of a theme. The file is located in `<theme_dir>/etc`.
628+
629+
```xml
630+
<var name="breakpoints">
631+
<var name="%breakpoints_option1%">%option1_value%</var>
632+
<var name="%breakpoints_option2%">%option2_value%</var>
633+
...
634+
</var>
635+
```

src/guides/v2.4/graphql/queries/products.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,12 +1050,12 @@ In the following example, a catalog price rule that provides a 10% discount on a
10501050
"currency": "USD"
10511051
},
10521052
"final_price": {
1053-
"value": 61,
1053+
"value": 54.9,
10541054
"currency": "USD"
10551055
},
10561056
"discount": {
1057-
"amount_off": 0,
1058-
"percent_off": 0
1057+
"amount_off": 6.1,
1058+
"percent_off": 10
10591059
}
10601060
},
10611061
"maximum_price": {
@@ -1064,12 +1064,12 @@ In the following example, a catalog price rule that provides a 10% discount on a
10641064
"currency": "USD"
10651065
},
10661066
"final_price": {
1067-
"value": 77,
1067+
"value": 69.3,
10681068
"currency": "USD"
10691069
},
10701070
"discount": {
1071-
"amount_off": 0,
1072-
"percent_off": 0
1071+
"amount_off": 7.7,
1072+
"percent_off": 10
10731073
}
10741074
}
10751075
}

0 commit comments

Comments
 (0)