kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[UPMERGE] 1.13 -> 1.14 (#16658)

Browse source 
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/1.14 -m "Resolve conflicts between 1.13 and 1.14"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
This commit is contained in:
Karol 2024-07-31 07:54:43 +02:00 • committed by GitHub
commit 76d1de3f92
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/ShopUser.xml
View file

@ -30,5 +30,11 @@
<collectionOperations/> <collectionOperations/>
<property name="id" identifier="true" writable="false" /> <property name="id" identifier="true" writable="false" />
<property name="verifiedAt" >
<attribute name="openapi_context">
<attribute name="type">boolean</attribute>
<attribute name="example">true</attribute>
</attribute>
</property>
</resource> </resource>
</resources> </resources>