Skip to content

Update production - #1354

Merged
iabeheer merged 19 commits into
productionfrom
main
Sep 15, 2026
Merged

iabeheer merged 19 commits into
productionfrom
main

Conversation

@Kurocon

@Kurocon Kurocon commented Sep 15, 2026

Copy link
Copy Markdown
Member

Changes:

  • Deny direct debits above (configurable) max amount
  • Change reply-to mail for SocCie declarations
  • New birthday picture
  • Room duty table overflow fix
  • Dependency updates

dependabot Bot and others added 19 commits August 31, 2026 10:07
Updates the requirements on [google-auth](https://github.com/googleapis/google-cloud-python) to permit the latest version.
- [Release notes](https://github.com/googleapis/google-cloud-python/releases)
- [Changelog](https://github.com/googleapis/google-cloud-python/blob/main/packages/google-cloud-documentai/CHANGELOG.md)
- [Commits](googleapis/google-cloud-python@google-auth-v2.49.1...google-auth-v2.57.0)

---
updated-dependencies:
- dependency-name: google-auth
  dependency-version: 2.57.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
…is amount are now unselectable for direct debit and an explanation is shown
…-gte-2.49.1-and-lt-2.58

build(deps): update google-auth requirement from <2.57,>=2.49.1 to >=2.49.1,<2.58
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...8.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Updates the requirements on [google-auth](https://github.com/googleapis/google-cloud-python) to permit the latest version.
- [Release notes](https://github.com/googleapis/google-cloud-python/releases)
- [Changelog](https://github.com/googleapis/google-cloud-python/blob/main/packages/google-cloud-documentai/CHANGELOG.md)
- [Commits](googleapis/google-cloud-python@google-auth-v2.49.1...google-auth-v2.58.0)

---
updated-dependencies:
- dependency-name: google-auth
  dependency-version: 2.58.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.69.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
…mobile-is-not-overflowing-correctly

Roomduty overview on mobile is not overflowing correctly
…g-toolbar-gte-3.7-and-lt-8.1

build(deps): update django-debug-toolbar requirement from <7.2,>=3.7 to >=3.7,<8.1
…-gte-2.49.1-and-lt-2.59

build(deps): update google-auth requirement from <2.58,>=2.49.1 to >=2.49.1,<2.59
…gte-2.54.0-and-lt-2.70

build(deps): update sentry-sdk requirement from <2.69,>=2.54.0 to >=2.54.0,<2.70
…t-personal-tab-direct-debit

Make personal tab direct debit above 250€ unselectable
@github-actions

Copy link
Copy Markdown

Triggered from #1354 by @​Kurocon.

Checking if we can fast forward production (fa32180) to main (d3db3b3).

Target branch (production):

commit fa321806e7229311ad8339602774e57d476ae479 (HEAD -> production, origin/production)
Author: Conner Hof <hofcl@inter-actief.net>
Date:   Mon Aug 24 16:47:54 2026 +0200

    Disable the CB theme for people with board permissions.

Pull request (main):

commit d3db3b3e166000b6b7b80804f3ceeb9105fd9333 (pull_request/main)
Merge: bc5c41e 9be885f
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Tue Sep 15 10:51:07 2026 +0200

    Merge pull request #1290 from Inter-Actief/1286-automatically-deselect-personal-tab-direct-debit
    
    Make personal tab direct debit above 250€ unselectable

It is possible to fast forward production (fa32180) to main (d3db3b3). 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 Sep 15, 2026

Copy link
Copy Markdown
Member Author

/fast-forward

@iabeheer

Copy link
Copy Markdown

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

Trying to fast forward production (fa32180) to main (d3db3b3).

Target branch (production):

commit fa321806e7229311ad8339602774e57d476ae479 (HEAD -> production, origin/production)
Author: Conner Hof <hofcl@inter-actief.net>
Date:   Mon Aug 24 16:47:54 2026 +0200

    Disable the CB theme for people with board permissions.

Pull request (main):

commit d3db3b3e166000b6b7b80804f3ceeb9105fd9333 (pull_request/main)
Merge: bc5c41e 9be885f
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Tue Sep 15 10:51:07 2026 +0200

    Merge pull request #1290 from Inter-Actief/1286-automatically-deselect-personal-tab-direct-debit
    
    Make personal tab direct debit above 250€ unselectable

Fast forwarding production (fa32180) to main (d3db3b3).

$ git push origin d3db3b3e166000b6b7b80804f3ceeb9105fd9333:production
remote: Bypassed rule violations for refs/heads/production:        
remote: 
remote: - At least 1 approving review is required by reviewers with write access.        
remote: 
remote: - Required status check "WIP" is expected.        
remote: 
To https://github.com/Inter-Actief/amelie.git
   fa32180..d3db3b3  d3db3b3e166000b6b7b80804f3ceeb9105fd9333 -> production

@iabeheer
iabeheer merged commit d3db3b3 into production Sep 15, 2026
11 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