2
0

fix: resolve import cycle and template errors
All checks were successful
Build and Release / Unit Tests (push) Successful in 5m26s
Build and Release / Lint (push) Successful in 5m37s
Build and Release / Build Binaries (arm64, linux) (push) Has been skipped
Build and Release / Integration Tests (PostgreSQL) (push) Successful in 2m38s
Build and Release / Create Release (push) Has been skipped
Build and Release / Build Binaries (amd64, darwin) (push) Has been skipped
Build and Release / Build Binaries (amd64, linux) (push) Has been skipped
Build and Release / Build Binaries (amd64, windows) (push) Has been skipped
Build and Release / Build Binaries (arm64, darwin) (push) Has been skipped

- Remove repo_service import from services/context/repo.go (caused import cycle)
- Inline HasWiki check using gitrepo.IsRepositoryExist
- Fix type assertion for Repo in org/home.go (any -> *repo_model.Repository)
- Add missing {{end}} in org/home.tmpl template
- Update licenses.txt with MarketAlly header

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
GitCaddy
2026-01-13 08:03:05 +00:00
parent c88c24147d
commit a4d0630815
5 changed files with 37 additions and 26 deletions

View File

Binary file not shown.

View File

@@ -1,3 +1,12 @@
--------------------------------------------------------------------------------
GitCaddy Server - Third Party Licenses
Copyright (c) 2024-2026 MarketAlly Inc.
https://marketally.com
GitCaddy is built on Gitea (https://gitea.com) and includes the following
open source software. We are grateful to all the contributors.
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
@braintree/sanitize-url@7.1.1 - MIT
--------------------------------------------------------------------------------
@@ -1311,6 +1320,30 @@ furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
--------------------------------------------------------------------------------
@github/combobox-nav@2.3.1 - MIT
--------------------------------------------------------------------------------
MIT License
Copyright (c) 2018 GitHub
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -1356,29 +1389,6 @@ the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--------------------------------------------------------------------------------
@github/paste-markdown@1.5.3 - MIT
--------------------------------------------------------------------------------
Copyright (c) 2018 GitHub, Inc.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

View File

@@ -190,7 +190,7 @@ func home(ctx *context.Context, viewRepositories bool) {
// Count public pinned repos for non-member visibility
hasPublicPinnedRepos := false
for _, p := range pinnedRepos {
if p.Repo != nil && !p.Repo.IsPrivate {
if repo, ok := p.Repo.(*repo_model.Repository); ok && repo != nil && !repo.IsPrivate {
hasPublicPinnedRepos = true
break
}

View File

@@ -35,7 +35,6 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
asymkey_service "code.gitea.io/gitea/services/asymkey"
repo_service "code.gitea.io/gitea/services/repository"
"github.com/editorconfig/editorconfig-core-go/v2"
)
@@ -605,7 +604,8 @@ func RepoAssignment(ctx *Context) {
}
// Check if wiki has content (for non-member visibility)
ctx.Data["HasWiki"] = repo_service.HasWiki(ctx, repo)
hasWiki, _ := gitrepo.IsRepositoryExist(ctx, repo.WikiStorageRepo())
ctx.Data["HasWiki"] = hasWiki
// Check if there are any packages (for non-member visibility)
numPackages, _ := packages_model.CountVersions(ctx, &packages_model.PackageSearchOptions{

View File

@@ -308,6 +308,7 @@
{{end}}
</div>
{{end}}
{{end}}
</div>
</div>
</div>