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 semantic.json #29860

Merged
merged 1 commit into from
Mar 17, 2024
Merged

Fix semantic.json #29860

merged 1 commit into from
Mar 17, 2024

Conversation

silverwind
Copy link
Member

Followup #29856

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 17, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 17, 2024
@silverwind silverwind added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Mar 17, 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 Mar 17, 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 Mar 17, 2024
@silverwind silverwind merged commit c20b568 into go-gitea:main Mar 17, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Mar 17, 2024
@silverwind silverwind deleted the sjson branch March 17, 2024 09:02
silverwind added a commit to silverwind/gitea that referenced this pull request Mar 17, 2024
@silverwind
Fix semantic.json (go-gitea#29860)
ac00197 
Followup go-gitea#29856
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 19, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
ea2609e 
* giteaofficial/main:
  Fix missing error check of bufio.Scanner (go-gitea#29882)
  Remove unused error in graceful manager (go-gitea#29871)
  Migrate border and margin classes to Tailwind (go-gitea#29828)
  Only do counting when count_only=true for repo dashboard (go-gitea#29884)
  Editor error message misleading due to re-used key. (go-gitea#29859)
  [skip ci] Updated licenses and gitignores
  move some scripts from 'build' to 'tools' directory, misc refactors (go-gitea#29844)
  Fix missing code in the user profile (go-gitea#29865)
  Upgrade Go 1.22 and upgrade dependency (go-gitea#29869)
  Fix the wrong locale key of searching users (go-gitea#29868)
  fix telegram webhook (go-gitea#29864)
  Fix user id column case (go-gitea#29863)
  Avoid JS error on issue/pr list when logged out (go-gitea#29854)
  Refactor clone-panel styles (go-gitea#29861)
  Simplify README (go-gitea#29827)
  Load citation JS only when needed (go-gitea#29855)
  Fix semantic.json (go-gitea#29860)

# Conflicts:
#	templates/repo/wiki/revision.tmpl
#	templates/repo/wiki/view.tmpl
@lunny lunny modified the milestones: 1.23.0, 1.22.0 Mar 22, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wxiaoguang wxiaoguang wxiaoguang 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.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@silverwind @wxiaoguang @delvh @lunny @GiteaBot