mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-04 04:14:01 +01:00 
			
		
		
		
	Backport #35714 by wxiaoguang Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		
							parent
							
								
									ac6d38e4b7
								
							
						
					
					
						commit
						387a4e72f7
					
				@ -5,6 +5,7 @@ package automergequeue
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
	"context"
 | 
						"context"
 | 
				
			||||||
 | 
						"errors"
 | 
				
			||||||
	"fmt"
 | 
						"fmt"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	issues_model "code.gitea.io/gitea/models/issues"
 | 
						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) {
 | 
					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)
 | 
						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)
 | 
							log.Error("Error adding pullID: %d to the pull requests patch checking queue %v", pr.ID, err)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -532,6 +532,10 @@ td .commit-summary {
 | 
				
			|||||||
  color: var(--color-text-light);
 | 
					  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 {
 | 
					.repository.view.issue .comment-list .timeline-item .comment-text-line a {
 | 
				
			||||||
  color: inherit;
 | 
					  color: inherit;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@ -654,8 +658,8 @@ td .commit-summary {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
.repository.view.issue .comment-list .code-comment .comment-header {
 | 
					.repository.view.issue .comment-list .code-comment .comment-header {
 | 
				
			||||||
  background: transparent;
 | 
					  background: transparent;
 | 
				
			||||||
  border-bottom: 0 !important;
 | 
					  border-bottom: 0;
 | 
				
			||||||
  padding: 0 !important;
 | 
					  padding: 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.repository.view.issue .comment-list .code-comment .comment-content {
 | 
					.repository.view.issue .comment-list .code-comment .comment-content {
 | 
				
			||||||
@ -1311,6 +1315,10 @@ td .commit-summary {
 | 
				
			|||||||
  gap: 0.25em;
 | 
					  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::before,
 | 
				
			||||||
.comment-header.arrow-top::after {
 | 
					.comment-header.arrow-top::after {
 | 
				
			||||||
  transform: rotate(90deg);
 | 
					  transform: rotate(90deg);
 | 
				
			||||||
 | 
				
			|||||||
@ -565,7 +565,7 @@ export default defineComponent({
 | 
				
			|||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
          <div class="job-info-header-right">
 | 
					          <div class="job-info-header-right">
 | 
				
			||||||
            <div class="ui top right pointing dropdown custom jump item" @click.stop="menuVisible = !menuVisible" @keyup.enter="menuVisible = !menuVisible">
 | 
					            <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"/>
 | 
					                <SvgIcon name="octicon-gear" :size="18"/>
 | 
				
			||||||
              </button>
 | 
					              </button>
 | 
				
			||||||
              <div class="menu transition action-job-menu" :class="{visible: menuVisible}" v-if="menuVisible" v-cloak>
 | 
					              <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 {
 | 
					.action-commit-summary {
 | 
				
			||||||
  display: flex;
 | 
					  display: flex;
 | 
				
			||||||
 | 
					  align-items: center;
 | 
				
			||||||
  flex-wrap: wrap;
 | 
					  flex-wrap: wrap;
 | 
				
			||||||
  gap: 5px;
 | 
					  gap: 5px;
 | 
				
			||||||
  margin-left: 28px;
 | 
					  margin-left: 28px;
 | 
				
			||||||
 | 
				
			|||||||
@ -148,7 +148,7 @@ const options: ChartOptions<'line'> = {
 | 
				
			|||||||
      {{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: `Code frequency over the history of ${repoLink.slice(1)}` }}
 | 
					      {{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: `Code frequency over the history of ${repoLink.slice(1)}` }}
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    <div class="tw-flex ui segment main-graph">
 | 
					    <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">
 | 
					        <div v-if="isLoading">
 | 
				
			||||||
          <SvgIcon name="octicon-sync" class="tw-mr-2 circular-spin"/>
 | 
					          <SvgIcon name="octicon-sync" class="tw-mr-2 circular-spin"/>
 | 
				
			||||||
          {{ locale.loadingInfo }}
 | 
					          {{ locale.loadingInfo }}
 | 
				
			||||||
 | 
				
			|||||||
@ -379,7 +379,7 @@ export default defineComponent({
 | 
				
			|||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    <div class="tw-flex ui segment main-graph">
 | 
					    <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">
 | 
					        <div v-if="isLoading">
 | 
				
			||||||
          <SvgIcon name="octicon-sync" class="tw-mr-2 circular-spin"/>
 | 
					          <SvgIcon name="octicon-sync" class="tw-mr-2 circular-spin"/>
 | 
				
			||||||
          {{ locale.loadingInfo }}
 | 
					          {{ locale.loadingInfo }}
 | 
				
			||||||
 | 
				
			|||||||
@ -126,7 +126,7 @@ const options: ChartOptions<'bar'> = {
 | 
				
			|||||||
      {{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: "Number of commits in the past year" }}
 | 
					      {{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: "Number of commits in the past year" }}
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    <div class="tw-flex ui segment main-graph">
 | 
					    <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">
 | 
					        <div v-if="isLoading">
 | 
				
			||||||
          <SvgIcon name="octicon-sync" class="tw-mr-2 circular-spin"/>
 | 
					          <SvgIcon name="octicon-sync" class="tw-mr-2 circular-spin"/>
 | 
				
			||||||
          {{ locale.loadingInfo }}
 | 
					          {{ locale.loadingInfo }}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user