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 bug when deleting wiki with no code write permission #24274

Merged
merged 4 commits into from Apr 23, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Apr 22, 2023

Fix #24125

@lunny lunny added type/bug outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels Apr 22, 2023
@GiteaBot GiteaBot added this to the 1.20.0 milestone Apr 22, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 22, 2023
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 23, 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 Apr 23, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 23, 2023
@GiteaBot
Copy link
Contributor

Please fix the merge conflicts. 🍵

@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 23, 2023
@silverwind silverwind enabled auto-merge (squash) April 23, 2023 20:57
@silverwind silverwind merged commit 284b41f into go-gitea:main Apr 23, 2023
1 of 2 checks passed
GiteaBot added a commit to GiteaBot/gitea that referenced this pull request Apr 23, 2023
)

Fix go-gitea#24125

Co-authored-by: Giteabot <teabot@gitea.io>
Co-authored-by: silverwind <me@silverwind.io>
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Apr 23, 2023
silverwind added a commit that referenced this pull request Apr 24, 2023
…4295)

Backport #24274 by @lunny

Fix #24125

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 24, 2023
* giteaofficial/main: (37 commits)
  [skip ci] Updated translations via Crowdin
  Add all `no-query` rules to eslint config (go-gitea#24294)
  Fix bug when deleting wiki with no code write permission (go-gitea#24274)
  Move code from module to service (go-gitea#24287)
  Add comments for Manually Merged feature (go-gitea#24291)
  Allow using localized absolute date times within phrases with place holders and localize issue due date events (go-gitea#24275)
  Handle canceled workflow as a warning instead of a fail (go-gitea#24282)
  Tweak pull request branch delete ui (go-gitea#23951)
  Restore air delay of 1000ms (go-gitea#24290)
  Load reviewer for comments when dismissing a review (go-gitea#24281)
  Set type="password" on all auth_token fields (go-gitea#22175)
  Only delete secrets belonging to its owner (go-gitea#24284)
  Fix inconsistent wiki path converting. (go-gitea#24277)
  Change to vertical navbar layout for secondary navbar for repo/user/admin settings  (go-gitea#24246)
  Refactor delete_modal_actions template and use it for project column related actions (go-gitea#24097)
  update upgrade script to use new CDN (go-gitea#24280)
  show workflow config error on file view also (go-gitea#24267)
  Add missing badges in user profile for /projects and /packages (go-gitea#24232)
  [skip ci] Updated translations via Crowdin
  Refactor `setting.Other` and remove unused `SHOW_FOOTER_BRANDING` (go-gitea#24270)
  ...

# Conflicts:
#	templates/base/footer_content.tmpl
@lunny lunny deleted the lunny/fix_delete_wiki branch May 25, 2023 08:10
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 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 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Org team users who have wiki write permission can not delete wiki page
5 participants