tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-10-21 23:54:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix various trivial problems (#35714)

Browse Source
This commit is contained in:
wxiaoguang 2025-10-21 13:19:29 +08:00 committed by GitHub
parent b2ee5be52e
commit a2eea2fb2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/automergequeue/automergequeue.go
View File

@ -5,6 +5,7 @@ package automergequeue
import (
"context"
"errors"
"fmt"
issues_model "code.gitea.io/gitea/models/issues"
@ -17,7 +18,7 @@ var AutoMergeQueue *queue.WorkerPoolQueue[string]
var AddToQueue = func(pr *issues_model.PullRequest, sha string) {
log.Trace("Adding pullID: %d to the pull requests patch checking queue with sha %s", pr.ID, sha)
if err := AutoMergeQueue.Push(fmt.Sprintf("%d_%s", pr.ID, sha)); err != nil {
if err := AutoMergeQueue.Push(fmt.Sprintf("%d_%s", pr.ID, sha)); err != nil && !errors.Is(err, queue.ErrAlreadyInQueue) {
log.Error("Error adding pullID: %d to the pull requests patch checking queue %v", pr.ID, err)
}
}

12
web_src/css/repo.css
View File

@ -532,6 +532,10 @@ td .commit-summary {
color: var(--color-text-light);
}
.repository.view.issue .comment-list .timeline-item .comment-text-line .ui.label {
line-height: 1.5; /* label has background, so it can't use parent's line-height */
}
.repository.view.issue .comment-list .timeline-item .comment-text-line a {
color: inherit;
}
@ -654,8 +658,8 @@ td .commit-summary {
.repository.view.issue .comment-list .code-comment .comment-header {
background: transparent;
border-bottom: 0 !important;
padding: 0 !important;
border-bottom: 0;
padding: 0;
}
.repository.view.issue .comment-list .code-comment .comment-content {
@ -1311,6 +1315,10 @@ td .commit-summary {
gap: 0.25em;
}
.comment-header.avatar-content-left-arrow::after {
border-right-color: var(--color-box-header);
}
.comment-header.arrow-top::before,
.comment-header.arrow-top::after {
transform: rotate(90deg);

3
web_src/js/components/RepoActionView.vue
View File

@ -565,7 +565,7 @@ export default defineComponent({
</div>
<div class="job-info-header-right">
<div class="ui top right pointing dropdown custom jump item" @click.stop="menuVisible = !menuVisible" @keyup.enter="menuVisible = !menuVisible">
<button class="btn gt-interact-bg tw-p-2">
<button class="ui button tw-px-3">
<SvgIcon name="octicon-gear" :size="18"/>
</button>
<div class="menu transition action-job-menu" :class="{visible: menuVisible}" v-if="menuVisible" v-cloak>
@ -667,6 +667,7 @@ export default defineComponent({
.action-commit-summary {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 5px;
margin-left: 28px;

2
web_src/js/components/RepoCodeFrequency.vue
View File

@ -148,7 +148,7 @@ const options: ChartOptions<'line'> = {
{{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: `Code frequency over the history of ${repoLink.slice(1)}` }}
</div>
<div class="tw-flex ui segment main-graph">
<div v-if="isLoading || errorText !== ''" class="gt-tc tw-m-auto">
<div v-if="isLoading || errorText !== ''" class="tw-m-auto">
<div v-if="isLoading">
<SvgIcon name="octicon-sync" class="tw-mr-2 circular-spin"/>
{{ locale.loadingInfo }}

2
web_src/js/components/RepoContributors.vue
View File

@ -379,7 +379,7 @@ export default defineComponent({
</div>
</div>
<div class="tw-flex ui segment main-graph">
<div v-if="isLoading || errorText !== ''" class="gt-tc tw-m-auto">
<div v-if="isLoading || errorText !== ''" class="tw-m-auto">
<div v-if="isLoading">
<SvgIcon name="octicon-sync" class="tw-mr-2 circular-spin"/>
{{ locale.loadingInfo }}

2
web_src/js/components/RepoRecentCommits.vue
View File

@ -126,7 +126,7 @@ const options: ChartOptions<'bar'> = {
{{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: "Number of commits in the past year" }}
</div>
<div class="tw-flex ui segment main-graph">
<div v-if="isLoading || errorText !== ''" class="gt-tc tw-m-auto">
<div v-if="isLoading || errorText !== ''" class="tw-m-auto">
<div v-if="isLoading">
<SvgIcon name="octicon-sync" class="tw-mr-2 circular-spin"/>
{{ locale.loadingInfo }}