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

Change branch name from master to main in some documents' links #25126

Merged
merged 3 commits into from
Jun 8, 2023

Conversation

HesterG
Copy link
Contributor

@HesterG HesterG commented Jun 8, 2023

As title. And needs to backport to 1.19

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 8, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 8, 2023
@HesterG HesterG added the type/docs This PR mainly updates/creates documentation label Jun 8, 2023
@HesterG HesterG added the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Jun 8, 2023
@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 Jun 8, 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 Jun 8, 2023
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 8, 2023
@silverwind silverwind enabled auto-merge (squash) June 8, 2023 07:35
@silverwind silverwind merged commit 206d3fb into go-gitea:main Jun 8, 2023
21 checks passed
@GiteaBot GiteaBot added this to the 1.21.0 milestone Jun 8, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 8, 2023
@GiteaBot
Copy link
Contributor

GiteaBot commented Jun 8, 2023

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

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

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Jun 8, 2023
@silverwind silverwind added backport/v1.20 This PR should be backported to Gitea 1.20 and removed outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels Jun 8, 2023
@silverwind
Copy link
Member

Backport label likely incorrect, @GiteaBot should retry for 1.20.

@HesterG
Copy link
Contributor Author

HesterG commented Jun 8, 2023

Might have conflicts for backporting 1.19, I will also do this manually for 1.19.

HesterG added a commit to HesterG/gitea that referenced this pull request Jun 8, 2023
@lunny lunny added the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Jun 8, 2023
HesterG added a commit to HesterG/gitea that referenced this pull request Jun 8, 2023
@HesterG
Copy link
Contributor Author

HesterG commented Jun 8, 2023

Also did that manually for 1.20

@HesterG HesterG added the backport/done All backports for this PR have been created label Jun 8, 2023
@HesterG HesterG deleted the change-main branch June 8, 2023 08:02
silverwind pushed a commit that referenced this pull request Jun 8, 2023
…) (#25139)

Backport #25126

As title. And needs to backport to 1.19
silverwind pushed a commit that referenced this pull request Jun 8, 2023
…) (#25140)

Backport #25126 to 1.20

As title. And needs to backport to 1.19
silverwind added a commit to silverwind/gitea that referenced this pull request Jun 8, 2023
* main:
  Modify OAuth login ui and fix display name, iconurl related logic (go-gitea#25030)
  Fix open redirect check for more cases (go-gitea#25143)
  Update js dependencies (go-gitea#25137)
  Remove duplicated functions when deleting a branch (go-gitea#25128)
  Add codeowners feature (go-gitea#24910)
  Fix strange UI behavior of cancelling dismiss review modal (go-gitea#25133)
  Fix `MilestoneIDs` when querying issues (go-gitea#25125)
  Fix incorrect git ignore rule and add missing license files (go-gitea#25135)
  Change branch name from master to main in some documents' links (go-gitea#25126)
  Remove incorrect element ID on "post-install" page (go-gitea#25104)
  [skip ci] Updated translations via Crowdin
  Improve notification icon and navbar  (go-gitea#25111)
  fix swagger documentation for multiple files API endpoint (go-gitea#25110)
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 9, 2023
* upstream/main:
  [skip ci] Updated translations via Crowdin
  Modify OAuth login ui and fix display name, iconurl related logic (go-gitea#25030)
  Fix open redirect check for more cases (go-gitea#25143)
  Update js dependencies (go-gitea#25137)
  Remove duplicated functions when deleting a branch (go-gitea#25128)
  Add codeowners feature (go-gitea#24910)
  Fix strange UI behavior of cancelling dismiss review modal (go-gitea#25133)
  Fix `MilestoneIDs` when querying issues (go-gitea#25125)
  Fix incorrect git ignore rule and add missing license files (go-gitea#25135)
  Change branch name from master to main in some documents' links (go-gitea#25126)
  Remove incorrect element ID on "post-install" page (go-gitea#25104)
  [skip ci] Updated translations via Crowdin
  Improve notification icon and navbar  (go-gitea#25111)
  fix swagger documentation for multiple files API endpoint (go-gitea#25110)
  Fix webauthn regression and improve code (go-gitea#25113)
  Add details summary for vertical menus in settings to allow toggling (go-gitea#25098)
  Fix 500 error caused by notifications without an issue such as repo transfers (go-gitea#25101)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 6, 2023
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/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. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/docs This PR mainly updates/creates documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants