Skip to content

Update production - #1328

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

iabeheer merged 2 commits into
productionfrom
main

Conversation

@Kurocon

@Kurocon Kurocon commented Aug 17, 2026

Copy link
Copy Markdown
Member

Translation fix

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

Co-authored-by: Kevin Alberts <albertskja@inter-actief.net>
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 #1328 by @​Kurocon.

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

Target branch (production):

commit 2a2e95de2c54d9d619b7379f54dfe08fb70efd38 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 17 18:49:12 2026 +0200

    Fix migration issue

Pull request (main):

commit 2230441e5a3f405ca3fa1d7f2759ccd428bf050a (pull_request/main)
Merge: 2a2e95d dab9a12
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Mon Aug 17 21:56:27 2026 +0200

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

It is possible to fast forward production (2a2e95d) to main (2230441). 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 #1328 (comment) by @​Kurocon.

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

Target branch (production):

commit 2a2e95de2c54d9d619b7379f54dfe08fb70efd38 (HEAD -> production, origin/production)
Author: Kevin Alberts <kevin@kevinalberts.nl>
Date:   Mon Aug 17 18:49:12 2026 +0200

    Fix migration issue

Pull request (main):

commit 2230441e5a3f405ca3fa1d7f2759ccd428bf050a (pull_request/main)
Merge: 2a2e95d dab9a12
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Mon Aug 17 21:56:27 2026 +0200

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

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

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

@iabeheer
iabeheer merged commit 2230441 into production Aug 17, 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