Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
forked fromgo-gitea/gitea

Commit85cc080

Browse files
wxiaoguangGiteaBot
authored andcommitted
Fix various trivial problems (go-gitea#35714)
1 parentac6d38e commit85cc080

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

‎services/automergequeue/automergequeue.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package automergequeue
55

66
import (
77
"context"
8+
"errors"
89
"fmt"
910

1011
issues_model"code.gitea.io/gitea/models/issues"
@@ -17,7 +18,7 @@ var AutoMergeQueue *queue.WorkerPoolQueue[string]
1718

1819
varAddToQueue=func(pr*issues_model.PullRequest,shastring) {
1920
log.Trace("Adding pullID: %d to the pull requests patch checking queue with sha %s",pr.ID,sha)
20-
iferr:=AutoMergeQueue.Push(fmt.Sprintf("%d_%s",pr.ID,sha));err!=nil {
21+
iferr:=AutoMergeQueue.Push(fmt.Sprintf("%d_%s",pr.ID,sha));err!=nil&&!errors.Is(err,queue.ErrAlreadyInQueue){
2122
log.Error("Error adding pullID: %d to the pull requests patch checking queue %v",pr.ID,err)
2223
}
2324
}

‎web_src/css/repo.css‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,10 @@ td .commit-summary {
532532
color:var(--color-text-light);
533533
}
534534

535+
.repository.view.issue .comment-list .timeline-item .comment-text-line .ui.label {
536+
line-height:1.5;/* label has background, so it can't use parent's line-height */
537+
}
538+
535539
.repository.view.issue .comment-list .timeline-item .comment-text-linea {
536540
color: inherit;
537541
}
@@ -654,8 +658,8 @@ td .commit-summary {
654658

655659
.repository.view.issue .comment-list .code-comment .comment-header {
656660
background: transparent;
657-
border-bottom:0!important;
658-
padding:0!important;
661+
border-bottom:0;
662+
padding:0;
659663
}
660664

661665
.repository.view.issue .comment-list .code-comment .comment-content {
@@ -1311,6 +1315,10 @@ td .commit-summary {
13111315
gap:0.25em;
13121316
}
13131317

1318+
.comment-header.avatar-content-left-arrow::after {
1319+
border-right-color:var(--color-box-header);
1320+
}
1321+
13141322
.comment-header.arrow-top::before,
13151323
.comment-header.arrow-top::after {
13161324
transform:rotate(90deg);

‎web_src/js/components/RepoActionView.vue‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ export default defineComponent({
565565
</div>
566566
<divclass="job-info-header-right">
567567
<divclass="ui top right pointing dropdown custom jump item"@click.stop="menuVisible = !menuVisible"@keyup.enter="menuVisible = !menuVisible">
568-
<buttonclass="btn gt-interact-bg tw-p-2">
568+
<buttonclass="ui button tw-px-3">
569569
<SvgIconname="octicon-gear":size="18"/>
570570
</button>
571571
<divclass="menu transition action-job-menu":class="{visible: menuVisible}"v-if="menuVisible"v-cloak>
@@ -667,6 +667,7 @@ export default defineComponent({
667667
668668
.action-commit-summary {
669669
display:flex;
670+
align-items:center;
670671
flex-wrap:wrap;
671672
gap:5px;
672673
margin-left:28px;

‎web_src/js/components/RepoCodeFrequency.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ const options: ChartOptions<'line'> = {
148148
{{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: `Code frequency over the history of ${repoLink.slice(1)}` }}
149149
</div>
150150
<divclass="tw-flex ui segment main-graph">
151-
<divv-if="isLoading || errorText !== ''"class="gt-tctw-m-auto">
151+
<divv-if="isLoading || errorText !== ''"class="tw-m-auto">
152152
<divv-if="isLoading">
153153
<SvgIconname="octicon-sync"class="tw-mr-2 circular-spin"/>
154154
{{ locale.loadingInfo }}

‎web_src/js/components/RepoContributors.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ export default defineComponent({
379379
</div>
380380
</div>
381381
<divclass="tw-flex ui segment main-graph">
382-
<divv-if="isLoading || errorText !== ''"class="gt-tctw-m-auto">
382+
<divv-if="isLoading || errorText !== ''"class="tw-m-auto">
383383
<divv-if="isLoading">
384384
<SvgIconname="octicon-sync"class="tw-mr-2 circular-spin"/>
385385
{{ locale.loadingInfo }}

‎web_src/js/components/RepoRecentCommits.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ const options: ChartOptions<'bar'> = {
126126
{{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: "Number of commits in the past year" }}
127127
</div>
128128
<divclass="tw-flex ui segment main-graph">
129-
<divv-if="isLoading || errorText !== ''"class="gt-tctw-m-auto">
129+
<divv-if="isLoading || errorText !== ''"class="tw-m-auto">
130130
<divv-if="isLoading">
131131
<SvgIconname="octicon-sync"class="tw-mr-2 circular-spin"/>
132132
{{ locale.loadingInfo }}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp