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

Remove duplicate ProxyPreserveHost in Apache httpd doc #31143

Merged
merged 2 commits into from
May 29, 2024
Merged

Remove duplicate ProxyPreserveHost in Apache httpd doc #31143

merged 2 commits into from
May 29, 2024

Conversation

HorlogeSkynet
Copy link
Contributor

@HorlogeSkynet HorlogeSkynet commented May 28, 2024


(fix up for #31003)

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 28, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 28, 2024
@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 May 28, 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 May 29, 2024
@silverwind silverwind added the backport/v1.22 This PR should be backported to Gitea 1.22 label May 29, 2024
@silverwind silverwind enabled auto-merge (squash) May 29, 2024 00:34
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 29, 2024
@silverwind silverwind merged commit c93cbc9 into go-gitea:main May 29, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone May 29, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 29, 2024
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels May 29, 2024
silverwind pushed a commit that referenced this pull request May 29, 2024
…1147)

Backport #31143 by @HorlogeSkynet

---

(fix up for #31003)

Co-authored-by: Samuel FORESTIER <HorlogeSkynet@users.noreply.github.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 30, 2024
* giteaofficial/main: (30 commits)
  Azure blob storage support (go-gitea#30995)
  Use repo as of renderctx's member rather than a repoPath on metas (go-gitea#29222)
  Ignore FindRecentlyPushedNewBranches err (go-gitea#31164)
  [skip ci] Updated translations via Crowdin
  Fix markup preview (go-gitea#31158)
  Swap word order in Comment and Close (go-gitea#31148)
  Fix push multiple branches error with tests (go-gitea#31151)
  Use vertical layout for multiple code expander buttons (go-gitea#31122)
  Remove duplicate `ProxyPreserveHost` in Apache httpd doc (go-gitea#31143)
  [skip ci] Updated translations via Crowdin
  Add an immutable tarball link to archive download headers for Nix (go-gitea#31139)
  Improve mobile review ui (go-gitea#31091)
  Add topics for repository API (go-gitea#31127)
  Add missed return after `ctx.ServerError` (go-gitea#31130)
  Fix API repository object format missed (go-gitea#31118)
  Fix DashboardRepoList margin (go-gitea#31121)
  Update JS dependencies (go-gitea#31120)
  [skip ci] Updated translations via Crowdin
  Prevent simultaneous editing of comments and issues (go-gitea#31053)
  Update demo site location from try.gitea.io -> demo.gitea.com (go-gitea#31054)
  ...
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/docs size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants