Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UPMERGE] 1.12 -> 1.13 #16407

Merged
merged 9 commits into from
Jun 17, 2024
Merged

[UPMERGE] 1.12 -> 1.13 #16407

merged 9 commits into from
Jun 17, 2024

Conversation

SyliusBot
Copy link

This PR has been generated automatically.
For more details see 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.13 -m "Resolve conflicts between 1.12 and 1.13"

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.

NoResponseMate and others added 9 commits June 12, 2024 16:15
…it (NoResponseMate)

This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 1.12
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | replaces #16383
| License         | MIT

Commits
-------

14c0e5f [User] Change the upper limits of token length
14ff1ac [User] Update default token length to 64 from 16
448e4eb Note user token length changes
…nseMate)

This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 1.12
| Bug fix?        | yes
| New feature?    | kinda
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | -
| License         | MIT


Commits
-------
  [Core] Add order token length to configuration
  [Core][Api] Use the order token length parameter when generating the token
  Note order token length parametrization
  Review fixes
@SyliusBot SyliusBot requested review from a team as code owners June 15, 2024 02:15
@probot-autolabeler probot-autolabeler bot added API APIs related issues and PRs. Maintenance CI configurations, READMEs, releases, etc. labels Jun 15, 2024
@GSadee GSadee merged commit c15a028 into 1.13 Jun 17, 2024
24 of 25 checks passed
@GSadee GSadee deleted the upmerge/1.12_1.13 branch June 17, 2024 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
API APIs related issues and PRs. Maintenance CI configurations, READMEs, releases, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants