Update production #1101
Merged
Update production #1101
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updates the requirements on [django-oauth-toolkit](https://github.com/django-oauth/django-oauth-toolkit) to permit the latest version. - [Release notes](https://github.com/django-oauth/django-oauth-toolkit/releases) - [Changelog](https://github.com/django-oauth/django-oauth-toolkit/blob/master/CHANGELOG.md) - [Commits](django-oauth/django-oauth-toolkit@1.7.1...3.2.0) --- updated-dependencies: - dependency-name: django-oauth-toolkit dependency-version: 3.2.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Updates the requirements on [model-bakery](https://github.com/model-bakers/model_bakery) to permit the latest version. - [Release notes](https://github.com/model-bakers/model_bakery/releases) - [Changelog](https://github.com/model-bakers/model_bakery/blob/main/CHANGELOG.md) - [Commits](model-bakers/model_bakery@1.7.0...1.21.0) --- updated-dependencies: - dependency-name: model-bakery dependency-version: 1.21.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Updates the requirements on [sentry-sdk](https://github.com/getsentry/sentry-python) to permit the latest version. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](getsentry/sentry-python@1.22.1...2.49.0) --- updated-dependencies: - dependency-name: sentry-sdk dependency-version: 2.49.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
…nnector connections' errors when someone prints a document, update translations file
Currently translated at 100.0% (2813 of 2813 strings) Merge remote-tracking branch 'origin/main' Translated using Weblate (Dutch) Currently translated at 100.0% (2811 of 2811 strings) Co-authored-by: Kevin Alberts <albertskja@inter-actief.net> Co-authored-by: Weblate <noreply@weblate.org> Translate-URL: https://weblate.ia.utwente.nl/projects/amelie/amelie/nl/ Translation: Amelie/Amelie
Translations update from Inter-/Actief/ Weblate
…h-toolkit-gte-1.7.1-and-lt-3.3 build(deps): update django-oauth-toolkit requirement from <3.2,>=1.7.1 to >=1.7.1,<3.3
…y-gte-1.7.0-and-lt-1.22 build(deps): update model-bakery requirement from <1.21,>=1.7.0 to >=1.7.0,<1.22
…gte-1.22.1-and-lt-2.50 build(deps): update sentry-sdk requirement from <2.49,>=1.22.1 to >=1.22.1,<2.50
|
Triggered from #1101 by @Kurocon. Checking if we can fast forward Target branch ( commit b3913d10bea4bbb4a4da76fca69f52344b71b01e (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date: Fri Jan 9 13:45:31 2026 +0100
workflows: Remove debug flag and unify tokensPull request ( commit 0a5553144b8fe6a8603485f7b6d862b443ece32e (pull_request/main)
Merge: a60a513 3202704
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Fri Jan 16 13:31:16 2026 +0100
Merge pull request #1099 from Inter-Actief/dependabot/pip/sentry-sdk-gte-1.22.1-and-lt-2.50
build(deps): update sentry-sdk requirement from <2.49,>=1.22.1 to >=1.22.1,<2.50It is possible to fast forward |
Member
Author
|
/fast-forward |
|
Triggered from #1101 (comment) by @Kurocon. Trying to fast forward Target branch ( commit b3913d10bea4bbb4a4da76fca69f52344b71b01e (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date: Fri Jan 9 13:45:31 2026 +0100
workflows: Remove debug flag and unify tokensPull request ( commit 0a5553144b8fe6a8603485f7b6d862b443ece32e (pull_request/main)
Merge: a60a513 3202704
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Fri Jan 16 13:31:16 2026 +0100
Merge pull request #1099 from Inter-Actief/dependabot/pip/sentry-sdk-gte-1.22.1-and-lt-2.50
build(deps): update sentry-sdk requirement from <2.49,>=1.22.1 to >=1.22.1,<2.50Fast forwarding $ git push origin 0a5553144b8fe6a8603485f7b6d862b443ece32e:production
remote: error: GH006: Protected branch update failed for refs/heads/production.
remote:
remote: - This branch must not contain merge commits.
remote: Found 1 violation:
remote:
remote: 0a5553144b8fe6a8603485f7b6d862b443ece32e
To https://github.com/Inter-Actief/amelie.git
! [remote rejected] 0a5553144b8fe6a8603485f7b6d862b443ece32e -> production (protected branch hook declined)
error: failed to push some refs to 'https://github.com/Inter-Actief/amelie.git' |
Member
Author
|
/fast-forward |
|
Triggered from #1101 (comment) by @Kurocon. Trying to fast forward Target branch ( commit b3913d10bea4bbb4a4da76fca69f52344b71b01e (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date: Fri Jan 9 13:45:31 2026 +0100
workflows: Remove debug flag and unify tokensPull request ( commit 0a5553144b8fe6a8603485f7b6d862b443ece32e (pull_request/main)
Merge: a60a513 3202704
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Fri Jan 16 13:31:16 2026 +0100
Merge pull request #1099 from Inter-Actief/dependabot/pip/sentry-sdk-gte-1.22.1-and-lt-2.50
build(deps): update sentry-sdk requirement from <2.49,>=1.22.1 to >=1.22.1,<2.50Fast forwarding $ git push origin 0a5553144b8fe6a8603485f7b6d862b443ece32e:production
remote: Bypassed rule violations for refs/heads/production:
remote:
remote: - At least 1 approving review is required by reviewers with write access.
remote:
To https://github.com/Inter-Actief/amelie.git
b3913d1..0a55531 0a5553144b8fe6a8603485f7b6d862b443ece32e -> production |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mainly a bugfix to avoid 2 errors in production each time someone prints using the site, but also includes some library updates and some small text changes on the print form and profile picture verify page.