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

Optimization of labels handling in issue_search #26460

Merged
merged 6 commits into from
Jun 25, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix conflict
techknowlogick authored Jun 25, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 47ecbb75434a6685f0067726f276b710dcd72c82
9 changes: 3 additions & 6 deletions models/issues/issue_search.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 The Gitea Authors. All rights reserved.
`// Copyright 2023 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package issues
@@ -14,12 +14,9 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unit"
user_model "code.gitea.io/gitea/models/user"
<<<<<<< main
"code.gitea.io/gitea/modules/container"
"code.gitea.io/gitea/modules/util"
=======
"code.gitea.io/gitea/modules/container"
"code.gitea.io/gitea/modules/optional"
>>>>>>> main
"code.gitea.io/gitea/modules/util"
"xorm.io/builder"
"xorm.io/xorm"
Loading