10000 chore: Merge back build 4.1.3 into `release/4.1.x` by fsbraun · Pull Request #8023 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

chore: Merge back build 4.1.3 into release/4.1.x #8023

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 13 commits into from
Oct 7, 2024
Merged

chore: Merge back build 4.1.3 into release/4.1.x #8023

merged 13 commits into from
Oct 7, 2024

Conversation

fsbraun
Copy link
Member
@fsbraun fsbraun commented Oct 5, 2024

Description

This is the release 4.1.3 to be merged back into release/4.1.x.

It contains a backport of today's fix for legacy action names for page permissions (#8021)

@marksweb Once this is merged back, we can IMHO release 4.1.3

Related resources

  • #...
  • #...

Checklist

  • I have opened this pull request against develop-4
  • I have added or modified the tests when changing logic
  • I have followed the conventional commits guidelines to add meaningful information into the changelog
  • I have read the contribution guidelines and I have joined the channel #pr-reviews on our Discord Server to find a “pr review buddy” who is going to review my pull request.

Github Release Action and others added 11 commits September 22, 2024 11:36
[4.1.3 release process] Building locales
eae0bd6
[4.1.3 release process] Bumped version to 4.1.3
3951c27
[4.1.3 release process] compilemessages
e57003f
[4.1.3 release process] compiling new static files
815e0ad
[4.1.3 release process] updating latest docs
42d7942
@fsbraun
Update CHANGELOG.rst
e24a9c8
@fsbraun
Update 4.1.3.rst
c47daff
@fsbraun
Update 4.1.3.rst
fa1c03e
@fsbraun
chore: Django 5.2-compatible test fixtures (#8008)
5797caa 
* chore: Re-hook fixture loading to stay compatible with django 5.2

* Remove Postgres pin to v12 for testing

* Exclude Py39 from dj51

* Pin postgres to version 15

* Switch from psycopg2 to recommended psycopg>=3.1.8

---------

Co-authored-by: Github Release Action <info@django-cms.org>
@fsbraun
Update CHANGELOG.rst typo
2ae666c
chore: Backport #8021
42f0d0d
@fsbraun fsbraun requested a review from marksweb October 5, 2024 09:06
@github-actions GitHub Actions
Copy link
github-actions bot commented Oct 5, 2024

👋 Hi there!

Please remember to MERGE COMMIT pull requests from develop or develop-4!

Do not SQUASH commits to preserve history for the changelog.

@github-actions GitHub Actions
Copy link
github-actions bot commented Oct 5, 2024

👋 Hi there!

Please remember to MERGE COMMIT pull requests from develop or develop-4!

Do not SQUASH commits to preserve history for the changelog.

@fsbraun fsbraun changed the title chore: Merge back release 4.1.3 into release/4.1.x chore: Merge back build 4.1.3 into release/4.1.x Oct 5, 2024
@github-actions GitHub Actions
Copy link
github-actions bot commented Oct 6, 2024

👋 Hi there!

Please remember to MERGE COMMIT pull requests from develop or develop-4!

Do not SQUASH commits to preserve history for the changelog.

marksweb
marksweb approved these changes Oct 7, 2024
View reviewed changes
Copy link
Member
@marksweb marksweb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah happy with with this 👍

@fsbraun fsbraun merged commit b827cb2 into release/4.1.x Oct 7, 2024
96 checks passed
@fsbraun fsbraun deleted the release/build branch October 7, 2024 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marksweb marksweb marksweb approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@fsbraun @marksweb
0