Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1049 Fix JSON header layout #1051

Merged
merged 1 commit into from
Oct 5, 2024
Merged

1049 Fix JSON header layout #1051

merged 1 commit into from
Oct 5, 2024

Conversation

pljones
Copy link
Contributor

@pljones pljones commented Sep 28, 2024 •
edited by ann0see
Loading

Short description of changes

Fix JSON header layout

Context: Fixes an issue? Related issues
Fixes #1049

Status of this Pull Request
Need to see the Github build output...

What is missing until this pull request can be merged?
Might work, might not... let's see :)

Does this need translation?
No.

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I'm sure that this Pull Request goes to the correct branch
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.

@pljones pljones linked an issue Sep 28, 2024 that may be closed by this pull request
[Bug] Unparsable json in headers #1049
Closed
@pljones pljones mentioned this pull request Sep 28, 2024
Closed
@ann0see ann0see added this to the Release 3.12.0 milestone Sep 30, 2024
@ann0see
Copy link
Member

ann0see commented Sep 30, 2024

We could probably also merge this into release...

@pljones pljones changed the base branch from next-release to release October 1, 2024 09:18
@pljones
Copy link
Contributor Author

pljones commented Oct 1, 2024

How about:

  • merge anything from Weblate into next-release
  • merge this into release
  • rebase next-release to release
  • update Weblate to pick up the above

@ann0see
Copy link
Member

ann0see commented Oct 2, 2024

Possible, but this requires a review of weblate changes.

If we merge this to release, the setup should automatically merge (not rebase) release to next release.

@pljones
Copy link
Contributor Author

pljones commented Oct 3, 2024 •
edited
Loading

OK, so

  • merge anything from Weblate into next-release (because I get nervous about it getting confused if it's got outstanding changes)
  • merge this into release
  • wait for the magic to happen
  • assess any problems and fix them

@pljones pljones mentioned this pull request Oct 5, 2024
Merged
@pljones pljones requested a review from ann0see October 5, 2024 08:31
@pljones pljones force-pushed the missing-comma-or-closing-bracket-1049 branch from 3000efd to bfb1ccd Compare October 5, 2024 08:33
@pljones pljones force-pushed the missing-comma-or-closing-bracket-1049 branch from bfb1ccd to 39214b6 Compare October 5, 2024 08:33
@ann0see
Copy link
Member

ann0see commented Oct 5, 2024

Let's try this.

@pljones pljones merged commit 8988840 into jamulussoftware:release Oct 5, 2024
1 check passed
@pljones pljones deleted the missing-comma-or-closing-bracket-1049 branch October 5, 2024 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ann0see ann0see ann0see approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Tracking
Status: Done
Milestone
Release 3.12.0
Development

Successfully merging this pull request may close these issues.

[Bug] Unparsable json in headers
2 participants
@pljones @ann0see