Skip to content

Update production - #1195

Merged
iabeheer merged 6 commits into
productionfrom
main
May 5, 2026
Merged

Update production#1195
iabeheer merged 6 commits into
productionfrom
main

Conversation

@Kurocon

@Kurocon Kurocon commented May 5, 2026

Copy link
Copy Markdown
Member
  • New global statistics pages accessible only to the board, for use in the almanac.

Kurocon and others added 6 commits May 5, 2026 14:23
Add some global statistics per year for the board/almanac
Currently translated at 100.0% (2914 of 2914 strings)

Translated using Weblate (Dutch)

Currently translated at 99.3% (2896 of 2914 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

github-actions Bot commented May 5, 2026

Copy link
Copy Markdown

Triggered from #1195 by @​Kurocon.

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

Target branch (production):

commit 8aa803c3a36e6584c06427e974b7d026c4649e60 (HEAD -> production, origin/production)
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

Pull request (main):

commit 66166cc8bfda51f7abbcec612e4b609e784a1fa3 (pull_request/main)
Merge: 3c499a2 8645290
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Tue May 5 14:56:10 2026 +0200

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

It is possible to fast forward production (8aa803c) to main (66166cc). 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 May 5, 2026

Copy link
Copy Markdown
Member Author

/fast-forward

@iabeheer

iabeheer commented May 5, 2026

Copy link
Copy Markdown

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

Trying to fast forward production (8aa803c) to main (66166cc).

Target branch (production):

commit 8aa803c3a36e6584c06427e974b7d026c4649e60 (HEAD -> production, origin/production)
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

Pull request (main):

commit 66166cc8bfda51f7abbcec612e4b609e784a1fa3 (pull_request/main)
Merge: 3c499a2 8645290
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Tue May 5 14:56:10 2026 +0200

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

Fast forwarding production (8aa803c) to main (66166cc).

$ git push origin 66166cc8bfda51f7abbcec612e4b609e784a1fa3: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
   8aa803c..66166cc  66166cc8bfda51f7abbcec612e4b609e784a1fa3 -> production

@iabeheer
iabeheer merged commit 66166cc into production May 5, 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.

3 participants