Skip to content

Update production - #1332

Merged
iabeheer merged 4 commits into
productionfrom
main
Aug 20, 2026
Merged

iabeheer merged 4 commits into
productionfrom
main

Conversation

@Kurocon

@Kurocon Kurocon commented Aug 20, 2026 •

Copy link
Copy Markdown
Member

Kurocon and others added 4 commits August 20, 2026 12:09
…ns. Show manual payment button to board members for unpaid transactions also for members that do have a mandate.
Currently translated at 100.0% (3337 of 3337 strings)

Translated using Weblate (Dutch)

Currently translated at 99.8% (3332 of 3337 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 #1332 by @​Kurocon.

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

Target branch (production):

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

Pull request (main):

commit edfd55b40de58d01da9536c6a28efb0e6906a4a5 (pull_request/main)
Merge: 66b13b1 e84c8eb
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Thu Aug 20 12:18:37 2026 +0200

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

It is possible to fast forward production (2230441) to main (edfd55b). 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 20, 2026

Copy link
Copy Markdown
Member Author

/fast-forward

@iabeheer

Copy link
Copy Markdown

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

Trying to fast forward production (2230441) to main (edfd55b).

Target branch (production):

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

Pull request (main):

commit edfd55b40de58d01da9536c6a28efb0e6906a4a5 (pull_request/main)
Merge: 66b13b1 e84c8eb
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Thu Aug 20 12:18:37 2026 +0200

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

Fast forwarding production (2230441) to main (edfd55b).

$ git push origin edfd55b40de58d01da9536c6a28efb0e6906a4a5: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
   2230441..edfd55b  edfd55b40de58d01da9536c6a28efb0e6906a4a5 -> production

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