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

Target specific OS for devcontainer base image #26422

Merged
merged 2 commits into from
Aug 10, 2023
Merged

Target specific OS for devcontainer base image #26422

merged 2 commits into from
Aug 10, 2023

Conversation

techknowlogick
Copy link
Member

fixes #25842

credit to philippbeckmann for discovering this

@techknowlogick techknowlogick added skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. backport/v1.20 This PR should be backported to Gitea 1.20 labels Aug 10, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 10, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 10, 2023
@techknowlogick techknowlogick mentioned this pull request Aug 10, 2023
Closed
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Aug 10, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Aug 10, 2023
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 10, 2023
@silverwind silverwind enabled auto-merge (squash) August 10, 2023 21:56
@silverwind silverwind merged commit bfef7d4 into go-gitea:main Aug 10, 2023
22 checks passed
@GiteaBot GiteaBot added this to the 1.21.0 milestone Aug 10, 2023
@GiteaBot
Copy link
Contributor

I was unable to create a backport for 1.20. @techknowlogick, please send one manually. 🍵

go run ./contrib/backport 26422
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Aug 10, 2023
@techknowlogick techknowlogick deleted the fix-25842 branch August 10, 2023 22:07
zjjhot added a commit to zjjhot/gitea that referenced this pull request Aug 11, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
6397195 
* upstream/main:
  Update upgrade documentation to add a check for deprecated configurations (go-gitea#26451)
  Fall back to esbuild for css minify (go-gitea#26445)
  Update JS dependencies (go-gitea#26449)
  Call git.InitSimple for runRepoSyncReleases (go-gitea#26396)
  Target specific OS for devcontainer base image (go-gitea#26422)
  Lock go to 1.21 on CI (go-gitea#26433)
  Always show usernames in reaction tooltips (go-gitea#26444)
  Fix incorrect redirection in new issue using references (go-gitea#26440)
  Fix the display of orgs listed in user profile (go-gitea#26424)
  minio: add missing region on client initialization (go-gitea#26412)
  Fix wrong middleware sequence (go-gitea#26428)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Nov 9, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

@jolheiser jolheiser jolheiser approved these changes

Assignees
No one assigned
Labels
backport/manual No power to the bots! Create your backport yourself! backport/v1.20 This PR should be backported to Gitea 1.20 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.

Devcontainer Build Failure - Maybe pip Package?
5 participants
@techknowlogick @GiteaBot @lunny @silverwind @jolheiser