Skip to content

Conversation

delvh
Copy link
Member

@delvh delvh commented Jan 8, 2023

Fixes #22371.

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 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 Jan 8, 2023
@zeripath zeripath merged commit b878155 into go-gitea:main Jan 8, 2023
@delvh delvh deleted the maintenance/cannot-instead-of-can-not branch January 8, 2023 18:29
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jan 9, 2023
* upstream/main:
  Replace `can not` with `cannot` (go-gitea#22372)
  Fix set system setting failure once it cached (go-gitea#22333)
  Bump json5 from 1.0.1 to 1.0.2 (go-gitea#22365)
  Always reuse transaction (go-gitea#22362)
  make /{username}.png redirect to user/org avatar (go-gitea#22356)
  Remove old HookEventType (go-gitea#22358)
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
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. modifies/translation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CANNOT is almost always preferred to 'CAN NOT'
4 participants