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

Fix Gitpod logic of setting ROOT_URL #29162

Merged
merged 2 commits into from
Feb 13, 2024

Conversation

yardenshoham
Copy link
Member

A long-living workspace can change its URL sometimes. On every startup, we revaluate the URL.

This is done to prevent the error on the admin page like: image

A long-living workspace can change its URL some times. On every startup we revaluate the URL.

This is done to prevent the error on the admin page like:
![image](https://github.com/go-gitea/gitea/assets/20454870/5d7e515b-7925-4101-9422-33102d7abe51)

Signed-off-by: Yarden Shoham <[email protected]>
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 13, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 13, 2024
.gitpod.yml Outdated Show resolved Hide resolved
@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 Feb 13, 2024
@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 Feb 13, 2024
@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 13, 2024
@silverwind
Copy link
Member

Couldn't it could just always write out all config options? Why distinguish first from subsequent start?

@yardenshoham
Copy link
Member Author

Gitea populates the file after the first start. Also you don't want the values to reset every time you start a workspace

@silverwind
Copy link
Member

Right, the config rewrite.

We really should make env vars work outside docker so that the config writing wouldn't be necessary, but that's another topic.

@techknowlogick techknowlogick merged commit 4f34691 into go-gitea:main Feb 13, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Feb 13, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 13, 2024
@yardenshoham yardenshoham deleted the gitpod-root-url branch February 14, 2024 07:01
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 14, 2024
* giteaofficial/main: (38 commits)
  Document how the TOC election process works (go-gitea#29135)
  Runner tokens are multi use (go-gitea#29153)
  Fix Gitpod logic of setting ROOT_URL (go-gitea#29162)
  Remove jQuery from the user search form in admin page (go-gitea#29151)
  Dont load Review if Comment is CommentTypeReviewRequest (go-gitea#28551)
  Show `View at this point in history` for every commit (go-gitea#29122)
  [skip ci] Updated translations via Crowdin
  Add merge style `fast-forward-only` (go-gitea#28954)
  Use Markdown alert syntax for notes in README (go-gitea#29150)
  Refactor issue template parsing and fix API endpoint (go-gitea#29069)
  [skip ci] Updated translations via Crowdin
  Update some translations and fix markdown formatting (go-gitea#29099)
  Show more settings for empty repositories (go-gitea#29130)
  Update JS and PY dependencies (go-gitea#29127)
  Add alert blocks in markdown (go-gitea#29121)
  Remove obsolete border-radius on comment content (go-gitea#29128)
  Make blockquote border size less aggressive (go-gitea#29124)
  Drop "@" from email sender to avoid spam filters (go-gitea#29109)
  [skip ci] Updated translations via Crowdin
  Disallow duplicate storage paths (go-gitea#26484)
  ...
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 15, 2024
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
6543 pushed a commit to 6543-forks/gitea that referenced this pull request Feb 26, 2024
Copy link

Automatically locked because of our CONTRIBUTING guidelines

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants