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

Fix docs failing the build on main #24561

Merged
merged 5 commits into from
May 6, 2023
Merged

Fix docs failing the build on main #24561

merged 5 commits into from
May 6, 2023

Conversation

yardenshoham
Copy link
Member

@yardenshoham
Fix docs failing the build on main
6343d66 
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 6, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 6, 2023
@yardenshoham yardenshoham added type/docs This PR mainly updates/creates documentation topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels May 6, 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 May 6, 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 May 6, 2023
@delvh delvh added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 6, 2023
@yardenshoham
Copy link
Member Author

Does this warrant a reviewed/prioritize-merge?

@delvh delvh added the reviewed/prioritize-merge PR is in the merge queue. Merge as soon as possible, i.e. as edits by maintainers are not enabled label May 6, 2023
@delvh
Copy link
Member

delvh commented May 6, 2023

You're absolutely right, I count CI fixes as extremely important as well.

@lunny lunny enabled auto-merge (squash) May 6, 2023 10:12
@lunny lunny merged commit ef92459 into go-gitea:main May 6, 2023
@GiteaBot GiteaBot added this to the 1.20.0 milestone May 6, 2023
@GiteaBot GiteaBot removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. reviewed/prioritize-merge PR is in the merge queue. Merge as soon as possible, i.e. as edits by maintainers are not enabled labels May 6, 2023
@yardenshoham yardenshoham deleted the fix-docs-build-breaking-main branch May 6, 2023 12:03
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 8, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
bc1f8d2 
* upstream/main:
  Fix broken link in tests/e2e/README (go-gitea#24576)
  [skip ci] Updated licenses and gitignores
  Add goto issue id function (go-gitea#24479)
  Improve decryption failure message (go-gitea#24573)
  Simplify template helper functions (go-gitea#24570)
  Makefile: Use portable !, not GNUish -not, with find(1). (go-gitea#24565)
  Add org visibility label to non-organization's dashboard (go-gitea#24558)
  Sort users and orgs on explore by recency by default (go-gitea#24279)
  Change `add_on` translation to `added_on` and include placeholder for the date (go-gitea#24562)
  Change `valid_until` translation to `valid_until_date` and include placeholder for the date (go-gitea#24563)
  Fix docs failing the build on `main` (go-gitea#24561)
  Improve wiki user title test (go-gitea#24559)
  Fix incorrect user visibility (go-gitea#24557)
  Change `join_on` translation to `joined_on` and include placeholder for the date (go-gitea#24550)
  Require at least one unit to be enabled (go-gitea#24189)
  Fix broken `README` link (go-gitea#24546)
  Check latest version on CI (go-gitea#24556)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 4, 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

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
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. topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile type/docs This PR mainly updates/creates documentation
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.
4 participants
@yardenshoham @delvh @lunny @GiteaBot