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

Update Gitea version to 1.22.1 #47

Merged
merged 1 commit into from
Jul 4, 2024
Merged

Update Gitea version to 1.22.1 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ springdoc-openapi.version=2.3.0
external-systems-client.version=2.0.43
gitlab4j-api.version=6.0.0-rc.4
bitbucket.version=8.14.0-jdk11
gitea.version=1.22.0
gitea.version=1.22.1
gitlab.version=16.2.4-ce.0
postgres.version=13-alpine
opensearch.version=2.11.1
Expand Down
7 changes: 3 additions & 4 deletions server/src/main/kotlin/org/octopusden/octopus/vcsfacade/service/impl/GiteaService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,8 @@ class GiteaService(
val organization = giteaRepository.fullName.lowercase().removeSuffix("/$repository")
return Repository("ssh://git@$host/$organization/$repository.git", //TODO: add "useColon" parameter?
"$httpUrl/$organization/$repository",
//IMPORTANT:
//Gitea version 1.22.0 started to return host url instead of empty string as avatar_url for repository with no avatar
//Will be fixed in 1.22.1, see https://github.com/go-gitea/gitea/pull/31187
//IMPORTANT: see https://github.com/go-gitea/gitea/pull/31187
//Gitea versions 1.22.0 and 1.22.1 return host url instead of empty string as avatar_url for repository with no avatar
giteaRepository.avatarUrl.let {
val path = try {
URI(it).path
Expand All @@ -285,7 +284,7 @@ class GiteaService(
}
if (path.trim('/').isEmpty()) null else it
}
//TODO: restore `giteaRepository.avatarUrl.ifBlank { null }` after Gitea update to 1.22.1 or higher
//TODO: restore `giteaRepository.avatarUrl.ifBlank { null }` after Gitea fix
)
}

Expand Down