Skip to content

Update production#1182

Merged
iabeheer merged 32 commits into
productionfrom
main
Apr 15, 2026
Merged

Update production#1182
iabeheer merged 32 commits into
productionfrom
main

Conversation

@Kurocon

@Kurocon Kurocon commented Apr 15, 2026

Copy link
Copy Markdown
Member

Dependency updates
Candidate board theme update
Weekmail div moved

dependabot Bot and others added 30 commits March 30, 2026 10:47
Updates the requirements on [requests](https://github.com/psf/requests) to permit the latest version.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](psf/requests@v2.32.0...v2.33.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-version: 2.33.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.56.0)

---
updated-dependencies:
- dependency-name: sentry-sdk
  dependency-version: 2.56.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.2.0)

---
updated-dependencies:
- dependency-name: python-gitlab
  dependency-version: 8.2.0
  dependency-type: direct:production
...

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

build(deps): update requests requirement from <2.33,>=2.32 to >=2.32,<2.34
…gte-2.54.0-and-lt-2.57

build(deps): update sentry-sdk requirement from <2.56,>=2.54.0 to >=2.54.0,<2.57
…ab-gte-8.1.0-and-lt-8.3

build(deps): update python-gitlab requirement from <8.2,>=8.1.0 to >=8.1.0,<8.3
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...6.3.0)

---
updated-dependencies:
- dependency-name: django-debug-toolbar
  dependency-version: 6.3.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.57.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Updates the requirements on [pillow](https://github.com/python-pillow/Pillow) to permit the latest version.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@12.1.1...12.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-version: 12.2.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Also greatly increased the KB experience by randomly moving elements around, changing words on the company page to 💰, and randomly removing the cursor sometimes. I really hope they appreciate my efforts
Sometimes names are jumbled!
Updates the requirements on [django-ckeditor](https://github.com/django-ckeditor/django-ckeditor) to permit the latest version.
- [Changelog](https://github.com/django-ckeditor/django-ckeditor/blob/main/CHANGELOG.rst)
- [Commits](django-ckeditor/django-ckeditor@6.3.2...6.7.3)

---
updated-dependencies:
- dependency-name: django-ckeditor
  dependency-version: 6.7.3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
…g-toolbar-gte-3.7-and-lt-6.4

build(deps): update django-debug-toolbar requirement from <6.3,>=3.7 to >=3.7,<6.4
Updates the requirements on [django-rosetta](https://github.com/mbi/django-rosetta) to permit the latest version.
- [Release notes](https://github.com/mbi/django-rosetta/releases)
- [Changelog](https://github.com/mbi/django-rosetta/blob/develop/CHANGES)
- [Commits](mbi/django-rosetta@v0.9.8...v0.10.3)

---
updated-dependencies:
- dependency-name: django-rosetta
  dependency-version: 0.10.3
  dependency-type: direct:production
...

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

build(deps): update sentry-sdk requirement from <2.57,>=2.54.0 to >=2.54.0,<2.58
…12.1.1-and-lt-12.3

build(deps): update pillow requirement from <12.2,>=12.1.1 to >=12.1.1,<12.3
…tta-gte-0.10.3-and-lt-0.11

build(deps): update django-rosetta requirement from <0.11,>=0.9.8 to >=0.10.3,<0.11
…itor-gte-6.7.3

build(deps): update django-ckeditor requirement from >=6.3.2 to >=6.7.3
changed weekmail to have the new weekmail button above the list
Improving the web experience for feutjes
Currently translated at 100.0% (2899 of 2899 strings)

Co-authored-by: Bart Oostveen <oostveenb@inter-actief.net>
Translate-URL: https://weblate.ia.utwente.nl/projects/amelie/amelie/nl/
Translation: Amelie/Amelie
Kurocon added 2 commits April 15, 2026 11:02
Translations update from Inter-/Actief/ Weblate
Update weekmail_list.html
@github-actions

Copy link
Copy Markdown

Triggered from #1182 by @​Kurocon.

Checking if we can fast forward production (c0c286e) to main (8aa803c).

Target branch (production):

commit c0c286ede3c1c46289aa8ded22ec9f5604fce56d (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Tue Mar 24 13:21:20 2026 +0100

    narrowcasting: Invert chat message order so newest messages are on the bottom

Pull request (main):

commit 8aa803c3a36e6584c06427e974b7d026c4649e60 (pull_request/main)
Merge: fb93f11 a9c5e08
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Wed Apr 15 11:03:27 2026 +0200

    Merge pull request #1180 from meijerpj/main
    
    Update weekmail_list.html

It is possible to fast forward production (c0c286e) to main (8aa803c). 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 Apr 15, 2026

Copy link
Copy Markdown
Member Author

/fast-forward

@iabeheer

Copy link
Copy Markdown

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

Trying to fast forward production (c0c286e) to main (8aa803c).

Target branch (production):

commit c0c286ede3c1c46289aa8ded22ec9f5604fce56d (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Tue Mar 24 13:21:20 2026 +0100

    narrowcasting: Invert chat message order so newest messages are on the bottom

Pull request (main):

commit 8aa803c3a36e6584c06427e974b7d026c4649e60 (pull_request/main)
Merge: fb93f11 a9c5e08
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Wed Apr 15 11:03:27 2026 +0200

    Merge pull request #1180 from meijerpj/main
    
    Update weekmail_list.html

Fast forwarding production (c0c286e) to main (8aa803c).

$ git push origin 8aa803c3a36e6584c06427e974b7d026c4649e60: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
   c0c286e..8aa803c  8aa803c3a36e6584c06427e974b7d026c4649e60 -> production

@iabeheer iabeheer merged commit 8aa803c into production Apr 15, 2026
16 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.

4 participants