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.

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

Chore: update main #233

Merged
merged 4 commits into from
Jun 23, 2024
Merged

Chore: update main #233

merged 4 commits into from
Jun 23, 2024

Conversation

JustSamuel
Copy link
Contributor

Description

Update main with the current develop, mostly fixes and restructures.

Related issues/external references

#226
#227
#230
#232

Types of changes

  • Chore

Copy link

Triggered from #233 by @​JustSamuel.

Checking if we can fast forward main (1d29c4f) to develop (1341c11).

Target branch (main):

commit 1d29c4fd30e2248f1f146a6d70c5f661873b0977 (HEAD -> main, origin/main)
Author: Samuel <samuel@gewis.nl>
Date:   Sat Jun 22 11:28:22 2024 +0200

    fix(pos-settings): revert mistake in last PR (#224)

Pull request (develop):

commit 1341c11c5a97b8048c243ef5e2e38b4df9770da5 (pull_request/develop)
Author: Samuel <samuel@gewis.nl>
Date:   Sun Jun 23 19:17:58 2024 +0200

    fix(point-of-sale): add a working PWA manifest that fixes viewport issues (#232)

It is possible to fast forward main (1d29c4f) to develop (1341c11). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward main to develop.

Copy link
Contributor

@CodeNamedRobin CodeNamedRobin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@JustSamuel
Copy link
Contributor Author

/fast-forward

1 similar comment
@CodeNamedRobin
Copy link
Contributor

/fast-forward

Copy link

Triggered from #233 (comment) by @​JustSamuel.

Trying to fast forward main (1d29c4f) to develop (1341c11).

Target branch (main):

commit 1d29c4fd30e2248f1f146a6d70c5f661873b0977 (HEAD -> main, origin/main)
Author: Samuel <samuel@gewis.nl>
Date:   Sat Jun 22 11:28:22 2024 +0200

    fix(pos-settings): revert mistake in last PR (#224)

Pull request (develop):

commit 1341c11c5a97b8048c243ef5e2e38b4df9770da5 (pull_request/develop)
Author: Samuel <samuel@gewis.nl>
Date:   Sun Jun 23 19:17:58 2024 +0200

    fix(point-of-sale): add a working PWA manifest that fixes viewport issues (#232)

Fast forwarding main (1d29c4f) to develop (1341c11).

$ git push origin 1341c11c5a97b8048c243ef5e2e38b4df9770da5:main
To https://github.com/GEWIS/sudosos-frontend.git
   1d29c4f..1341c11  1341c11c5a97b8048c243ef5e2e38b4df9770da5 -> main

@github-actions github-actions bot merged commit 1341c11 into main Jun 23, 2024
7 checks passed
Copy link

Triggered from #233 (comment) by @​CodeNamedRobin.

Trying to fast forward main (1341c11) to develop (1341c11).

Target branch (main):

commit 1341c11c5a97b8048c243ef5e2e38b4df9770da5 (HEAD -> main, origin/main, pull_request/develop)
Author: Samuel <samuel@gewis.nl>
Date:   Sun Jun 23 19:17:58 2024 +0200

    fix(point-of-sale): add a working PWA manifest that fixes viewport issues (#232)

Pull request (develop):

commit 1341c11c5a97b8048c243ef5e2e38b4df9770da5 (HEAD -> main, origin/main, pull_request/develop)
Author: Samuel <samuel@gewis.nl>
Date:   Sun Jun 23 19:17:58 2024 +0200

    fix(point-of-sale): add a working PWA manifest that fixes viewport issues (#232)

Fast forwarding main (1341c11) to develop (1341c11).

$ git push origin 1341c11c5a97b8048c243ef5e2e38b4df9770da5:main
Everything up-to-date

Copy link

🎉 This PR is included in version 1.0.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants