Skip to content

Update production - #1318

Merged
iabeheer merged 62 commits into
productionfrom
main
Aug 17, 2026
Merged

iabeheer merged 62 commits into
productionfrom
main

Conversation

@Kurocon

@Kurocon Kurocon commented Aug 14, 2026 •

Copy link
Copy Markdown
Member

MiniLars and others added 30 commits July 15, 2026 03:49
…e will override the declaration email to the committee declaration email. Also people will now receive a CC of their declaration
…ction with same information as original print transaction.
…add Django Admin views for new models, fix incorrect auto-calculated settlement amount if it is not passed to the create method, set transaction added_by in settlement transactions
# Conflicts:
#	amelie/personal_tab/debt_collection.py
#	amelie/personal_tab/forms.py
#	amelie/personal_tab/views.py
…om-of-page

# Conflicts:
#	amelie/personal_tab/views.py
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.23.3...1.24.0)

---
updated-dependencies:
- dependency-name: model-bakery
  dependency-version: 1.24.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Updates the requirements on [pyopenssl](https://github.com/pyca/pyopenssl) to permit the latest version.
- [Changelog](https://github.com/pyca/pyopenssl/blob/main/CHANGELOG.rst)
- [Commits](pyca/pyopenssl@26.0.0...26.4.0)

---
updated-dependencies:
- dependency-name: pyopenssl
  dependency-version: 26.4.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Updates the requirements on [python-gitlab](https://github.com/python-gitlab/python-gitlab) to permit the latest version.
- [Release notes](https://github.com/python-gitlab/python-gitlab/releases)
- [Changelog](https://github.com/python-gitlab/python-gitlab/blob/main/CHANGELOG.md)
- [Commits](python-gitlab/python-gitlab@v8.1.0...v8.5.0)

---
updated-dependencies:
- dependency-name: python-gitlab
  dependency-version: 8.5.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@2.54.0...2.66.1)

---
updated-dependencies:
- dependency-name: sentry-sdk
  dependency-version: 2.66.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
- Only allow activity prices to be positive (including enrollments), to avoid incorrect behaviour w.r.t. transaction handling
- Add activity name and print datetime to printed enrollment form
- Show amount to be paid for manual enrollments on activity enrollment overview and printed form
- Only re-add transaction after editing enrollment if the enrollment is not free
- Settle positive and negative enrollment transactions against eachother when editing enrollment or unenrolling
- Fix n.a. abbreviation to N/A
- Fixed edge case where someone could get a negative enrollment when editing the maximum of a numeric enrollment option
- Added general check to deny negative enrollment costs, even if it's theoretically allowed by the activity
- Fixed numeric enrollment behaviour w.r.t. maximum places, free places, and giving up partial places
- Fixed too strict negative check when numeric enrollment max per person was high but max for entire option was low
- General improvements showing errors in enrollment options
- Fix date comparison for re-creating transactions when editing activity
- Fix creating participation transactions when the costs are 0
- Order transactions by inverse PK by default if date and added-on are not unique
…gte-2.54.0-and-lt-2.67

build(deps): update sentry-sdk requirement from <2.65,>=2.54.0 to >=2.54.0,<2.67
@github-actions

Copy link
Copy Markdown

Triggered from #1318 by @​Kurocon.

Checking if we can fast forward production (2ccdc77) to main (c4e6337).

Target branch (production):

commit 2ccdc775da94a5a5b4ba7311f0fa936dd882a1d3 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 10 20:43:51 2026 +0200

    Do not send media format, this breaks the new printer

Pull request (main):

commit c4e6337e1ec55b5e4d2cd95bd720fc00708f5666 (pull_request/main)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Fri Aug 14 18:14:47 2026 +0200

    Update django-modern-rpc to v2.1.0 and update test and documentation for new error code

It is possible to fast forward production (2ccdc77) to main (c4e6337). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

@github-actions

Copy link
Copy Markdown

Triggered from #1318 by @​Kurocon.

Checking if we can fast forward production (2ccdc77) to main (0f69f91).

Target branch (production):

commit 2ccdc775da94a5a5b4ba7311f0fa936dd882a1d3 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 10 20:43:51 2026 +0200

    Do not send media format, this breaks the new printer

Pull request (main):

commit 0f69f918861e7b3e0489a942c1d2cd9266390db0 (pull_request/main)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Sat Aug 15 10:03:08 2026 +0200

    Add declaration submitter name and date to subject to avoid grouping in Gmail

It is possible to fast forward production (2ccdc77) to main (0f69f91). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

dependabot Bot and others added 4 commits August 17, 2026 10:05
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@2.54.0...2.68.0)

---
updated-dependencies:
- dependency-name: sentry-sdk
  dependency-version: 2.68.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Updates the requirements on [httplib2](https://github.com/httplib2/httplib2) to permit the latest version.
- [Changelog](https://github.com/httplib2/httplib2/blob/master/CHANGELOG)
- [Commits](httplib2/httplib2@v0.20.4...v0.32.0)

---
updated-dependencies:
- dependency-name: httplib2
  dependency-version: 0.32.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Updates the requirements on [django-debug-toolbar](https://github.com/django-commons/django-debug-toolbar) to permit the latest version.
- [Release notes](https://github.com/django-commons/django-debug-toolbar/releases)
- [Changelog](https://github.com/django-commons/django-debug-toolbar/blob/main/docs/changes.rst)
- [Commits](django-commons/django-debug-toolbar@3.7...7.1.0)

---
updated-dependencies:
- dependency-name: django-debug-toolbar
  dependency-version: 7.1.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
…gte-2.54.0-and-lt-2.69

build(deps): update sentry-sdk requirement from <2.67,>=2.54.0 to >=2.54.0,<2.69
@github-actions

Copy link
Copy Markdown

Triggered from #1318 by @​Kurocon.

Checking if we can fast forward production (2ccdc77) to main (682c648).

Target branch (production):

commit 2ccdc775da94a5a5b4ba7311f0fa936dd882a1d3 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 10 20:43:51 2026 +0200

    Do not send media format, this breaks the new printer

Pull request (main):

commit 682c64884ded832af7f95c7037374ee39657363f (pull_request/main)
Merge: 0f69f91 8b81754
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Mon Aug 17 12:15:34 2026 +0200

    Merge pull request #1321 from Inter-Actief/dependabot/pip/sentry-sdk-gte-2.54.0-and-lt-2.69
    
    build(deps): update sentry-sdk requirement from <2.67,>=2.54.0 to >=2.54.0,<2.69

It is possible to fast forward production (2ccdc77) to main (682c648). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

…e-0.20.4-and-lt-0.33

build(deps): update httplib2 requirement from <0.32,>=0.20.4 to >=0.20.4,<0.33
@github-actions

Copy link
Copy Markdown

Triggered from #1318 by @​Kurocon.

Checking if we can fast forward production (2ccdc77) to main (e9edaee).

Target branch (production):

commit 2ccdc775da94a5a5b4ba7311f0fa936dd882a1d3 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 10 20:43:51 2026 +0200

    Do not send media format, this breaks the new printer

Pull request (main):

commit e9edaee9885ff154fa1484b7ea2d4029309dfdf3 (pull_request/main)
Merge: 682c648 5fc3005
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Mon Aug 17 12:15:58 2026 +0200

    Merge pull request #1322 from Inter-Actief/dependabot/pip/httplib2-gte-0.20.4-and-lt-0.33
    
    build(deps): update httplib2 requirement from <0.32,>=0.20.4 to >=0.20.4,<0.33

It is possible to fast forward production (2ccdc77) to main (e9edaee). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

…g-toolbar-gte-3.7-and-lt-7.2

build(deps): update django-debug-toolbar requirement from <7.1,>=3.7 to >=3.7,<7.2
@github-actions

Copy link
Copy Markdown

Triggered from #1318 by @​Kurocon.

Checking if we can fast forward production (2ccdc77) to main (b99751c).

Target branch (production):

commit 2ccdc775da94a5a5b4ba7311f0fa936dd882a1d3 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 10 20:43:51 2026 +0200

    Do not send media format, this breaks the new printer

Pull request (main):

commit b99751c89f6f41aa9a05763a3b7a7b023aceab63 (pull_request/main)
Merge: e9edaee 57d177f
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Mon Aug 17 12:16:21 2026 +0200

    Merge pull request #1323 from Inter-Actief/dependabot/pip/django-debug-toolbar-gte-3.7-and-lt-7.2
    
    build(deps): update django-debug-toolbar requirement from <7.1,>=3.7 to >=3.7,<7.2

It is possible to fast forward production (2ccdc77) to main (b99751c). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

dependabot Bot and others added 3 commits August 17, 2026 10:17
Updates the requirements on [docutils](https://github.com/rtfd/recommonmark) to permit the latest version.
- [Changelog](https://github.com/readthedocs/recommonmark/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rtfd/recommonmark/commits)

---
updated-dependencies:
- dependency-name: docutils
  dependency-version: '0.23'
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Updates the requirements on [django-health-check](https://github.com/codingjoe/django-health-check) to permit the latest version.
- [Release notes](https://github.com/codingjoe/django-health-check/releases)
- [Commits](codingjoe/django-health-check@4.0.0...4.5.0)

---
updated-dependencies:
- dependency-name: django-health-check
  dependency-version: 4.5.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
…e-0.19-and-lt-0.24

build(deps): update docutils requirement from <0.23,>=0.19 to >=0.19,<0.24
@github-actions

Copy link
Copy Markdown

Triggered from #1318 by @​Kurocon.

Checking if we can fast forward production (2ccdc77) to main (e5f7f2e).

Target branch (production):

commit 2ccdc775da94a5a5b4ba7311f0fa936dd882a1d3 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 10 20:43:51 2026 +0200

    Do not send media format, this breaks the new printer

Pull request (main):

commit e5f7f2e29aadc1d838d03dd3bc4a0a90e0f105f4 (pull_request/main)
Merge: b99751c 8085d03
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Mon Aug 17 12:18:12 2026 +0200

    Merge pull request #1324 from Inter-Actief/dependabot/pip/docutils-gte-0.19-and-lt-0.24
    
    build(deps): update docutils requirement from <0.23,>=0.19 to >=0.19,<0.24

It is possible to fast forward production (2ccdc77) to main (e5f7f2e). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

…th-check-gte-4.0-and-lt-4.6

build(deps): update django-health-check requirement from <4.5,>=4.0 to >=4.0,<4.6
@github-actions

Copy link
Copy Markdown

Triggered from #1318 by @​Kurocon.

Checking if we can fast forward production (2ccdc77) to main (a61387c).

Target branch (production):

commit 2ccdc775da94a5a5b4ba7311f0fa936dd882a1d3 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 10 20:43:51 2026 +0200

    Do not send media format, this breaks the new printer

Pull request (main):

commit a61387c4264244e630befcb62e8ea9f4053c0bf1 (pull_request/main)
Merge: e5f7f2e e7aebbf
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Mon Aug 17 12:18:35 2026 +0200

    Merge pull request #1325 from Inter-Actief/dependabot/pip/django-health-check-gte-4.0-and-lt-4.6
    
    build(deps): update django-health-check requirement from <4.5,>=4.0 to >=4.0,<4.6

It is possible to fast forward production (2ccdc77) to main (a61387c). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

@github-actions

Copy link
Copy Markdown

Triggered from #1318 by @​Kurocon.

Checking if we can fast forward production (2ccdc77) to main (9beb7fa).

Target branch (production):

commit 2ccdc775da94a5a5b4ba7311f0fa936dd882a1d3 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 10 20:43:51 2026 +0200

    Do not send media format, this breaks the new printer

Pull request (main):

commit 9beb7fa0cc27c1103c66fda5bb39c73709313dc7 (pull_request/main)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 17 14:54:24 2026 +0200

    Add registration overview showing new members in the current academic year, to track enrollment status

It is possible to fast forward production (2ccdc77) to main (9beb7fa). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

@github-actions

Copy link
Copy Markdown

Triggered from #1318 by @​Kurocon.

Checking if we can fast forward production (2ccdc77) to main (593321a).

Target branch (production):

commit 2ccdc775da94a5a5b4ba7311f0fa936dd882a1d3 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 10 20:43:51 2026 +0200

    Do not send media format, this breaks the new printer

Pull request (main):

commit 593321a5ea31dd1393d8aeeb3bb87b70707386a2 (pull_request/main)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 17 14:55:41 2026 +0200

    Update translation files

It is possible to fast forward production (2ccdc77) to main (593321a). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

weblate and others added 2 commits August 17, 2026 14:58
Currently translated at 100.0% (3333 of 3333 strings)

Translated using Weblate (Dutch)

Currently translated at 91.5% (3050 of 3333 strings)

Co-authored-by: Kevin Alberts <albertskja@inter-actief.net>
Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org>
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
@github-actions

Copy link
Copy Markdown

Triggered from #1318 by @​Kurocon.

Checking if we can fast forward production (2ccdc77) to main (ca94800).

Target branch (production):

commit 2ccdc775da94a5a5b4ba7311f0fa936dd882a1d3 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 10 20:43:51 2026 +0200

    Do not send media format, this breaks the new printer

Pull request (main):

commit ca9480084b01e0f49802052afc4c9bb72c1f6663 (pull_request/main)
Merge: 593321a 8434959
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Mon Aug 17 18:41:18 2026 +0200

    Merge pull request #1326 from Inter-Actief/ia-weblate
    
    Translations update from Inter-/Actief/ Weblate

It is possible to fast forward production (2ccdc77) to main (ca94800). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

@github-actions

Copy link
Copy Markdown

Triggered from #1318 by @​Kurocon.

Checking if we can fast forward production (2ccdc77) to main (2a2e95d).

Target branch (production):

commit 2ccdc775da94a5a5b4ba7311f0fa936dd882a1d3 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 10 20:43:51 2026 +0200

    Do not send media format, this breaks the new printer

Pull request (main):

commit 2a2e95de2c54d9d619b7379f54dfe08fb70efd38 (pull_request/main)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 17 18:49:12 2026 +0200

    Fix migration issue

It is possible to fast forward production (2ccdc77) to main (2a2e95d). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

@Kurocon

Kurocon commented Aug 17, 2026

Copy link
Copy Markdown
Member Author

/fast-forward

@iabeheer

Copy link
Copy Markdown

Triggered from #1318 (comment) by @​Kurocon.

Trying to fast forward production (2ccdc77) to main (2a2e95d).

Target branch (production):

commit 2ccdc775da94a5a5b4ba7311f0fa936dd882a1d3 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 10 20:43:51 2026 +0200

    Do not send media format, this breaks the new printer

Pull request (main):

commit 2a2e95de2c54d9d619b7379f54dfe08fb70efd38 (pull_request/main)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 17 18:49:12 2026 +0200

    Fix migration issue

Fast forwarding production (2ccdc77) to main (2a2e95d).

$ git push origin 2a2e95de2c54d9d619b7379f54dfe08fb70efd38: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
   2ccdc77..2a2e95d  2a2e95de2c54d9d619b7379f54dfe08fb70efd38 -> production

@iabeheer
iabeheer merged commit 2a2e95d into production Aug 17, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants