.drone.yml

@@ -1162,7 +1162,7 @@ steps:
     pull: always
     settings:
       auto_tag: false
-      tags: nightly-linux-amd64
+      tags: dev-linux-amd64
       repo: gitea/gitea
       build_args:
         - GOPROXY=https://goproxy.io
@@ -1184,7 +1184,7 @@ steps:
     settings:
       dockerfile: Dockerfile.rootless
       auto_tag: false
-      tags: nightly-linux-amd64-rootless
+      tags: dev-linux-amd64-rootless
       repo: gitea/gitea
       build_args:
         - GOPROXY=https://goproxy.io
@@ -1487,7 +1487,7 @@ steps:
     pull: always
     settings:
       auto_tag: false
-      tags: nightly-linux-arm64
+      tags: dev-linux-arm64
       repo: gitea/gitea
       build_args:
         - GOPROXY=https://goproxy.io
@@ -1509,7 +1509,7 @@ steps:
     settings:
       dockerfile: Dockerfile.rootless
       auto_tag: false
-      tags: nightly-linux-arm64-rootless
+      tags: dev-linux-arm64-rootless
       repo: gitea/gitea
       build_args:
         - GOPROXY=https://goproxy.io

models/db/search.go

@@ -31,5 +31,5 @@ const (
 const (
 	// Which means a condition to filter the records which don't match any id.
 	// It's different from zero which means the condition could be ignored.
-	NoConditionID = -1
+	NoneID = -1
 )

models/issues/issue.go

@@ -1266,9 +1266,7 @@ func (opts *IssuesOptions) setupSessionNoLimit(sess *xorm.Session) {
 		applySubscribedCondition(sess, opts.SubscriberID)
 	}
 
-	if len(opts.MilestoneIDs) == 1 && opts.MilestoneIDs[0] == db.NoConditionID {
+	if len(opts.MilestoneIDs) > 0 {
-		sess.And("issue.milestone_id = 0")
-	} else if len(opts.MilestoneIDs) > 0 {
 		sess.In("issue.milestone_id", opts.MilestoneIDs)
 	}
 
@@ -1282,7 +1280,7 @@ func (opts *IssuesOptions) setupSessionNoLimit(sess *xorm.Session) {
 	if opts.ProjectID > 0 {
 		sess.Join("INNER", "project_issue", "issue.id = project_issue.issue_id").
 			And("project_issue.project_id=?", opts.ProjectID)
-	} else if opts.ProjectID == db.NoConditionID { // show those that are in no project
+	} else if opts.ProjectID == db.NoneID { // show those that are in no project
 		sess.And(builder.NotIn("issue.id", builder.Select("issue_id").From("project_issue")))
 	}
 
@@ -1682,8 +1680,6 @@ func getIssueStatsChunk(opts *IssueStatsOptions, issueIDs []int64) (*IssueStats,
 
 		if opts.MilestoneID > 0 {
 			sess.And("issue.milestone_id = ?", opts.MilestoneID)
-		} else if opts.MilestoneID == db.NoConditionID {
-			sess.And("issue.milestone_id = 0")
 		}
 
 		if opts.ProjectID > 0 {

modules/queue/queue_channel_test.go

@@ -4,7 +4,6 @@
 package queue
 
 import (
-	"os"
 	"sync"
 	"testing"
 	"time"
@@ -102,9 +101,6 @@ func TestChannelQueue_Batch(t *testing.T) {
 }
 
 func TestChannelQueue_Pause(t *testing.T) {
-	if os.Getenv("CI") != "" {
-		t.Skip("Skipping because test is flaky on CI")
-	}
 	lock := sync.Mutex{}
 	var queue Queue
 	var err error

modules/queue/unique_queue_disk_channel_test.go

@@ -5,7 +5,6 @@ package queue
 
 import (
 	"fmt"
-	"os"
 	"strconv"
 	"sync"
 	"testing"
@@ -17,9 +16,6 @@ import (
 )
 
 func TestPersistableChannelUniqueQueue(t *testing.T) {
-	if os.Getenv("CI") != "" {
-		t.Skip("Skipping because test is flaky on CI")
-	}
 	tmpDir := t.TempDir()
 	fmt.Printf("TempDir %s\n", tmpDir)
 	_ = log.NewLogger(1000, "console", "console", `{"level":"warn","stacktracelevel":"NONE","stderr":true}`)

options/locale/locale_en-US.ini

@@ -1310,10 +1310,7 @@ issues.filter_label = Label
 issues.filter_label_exclude = `Use <code>alt</code> + <code>click/enter</code> to exclude labels`
 issues.filter_label_no_select = All labels
 issues.filter_milestone = Milestone
-issues.filter_milestone_all = All milestones
+issues.filter_milestone_no_select = All milestones
-issues.filter_milestone_none = No milestones
-issues.filter_milestone_open = Open milestones
-issues.filter_milestone_closed = Closed milestones
 issues.filter_project = Project
 issues.filter_project_all = All projects
 issues.filter_project_none = No project

routers/web/repo/issue.go

@@ -237,7 +237,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti
 	pager := context.NewPagination(total, setting.UI.IssuePagingNum, page, 5)
 
 	var mileIDs []int64
-	if milestoneID > 0 || milestoneID == db.NoConditionID { // -1 to get those issues which have no any milestone assigned
+	if milestoneID > 0 {
 		mileIDs = []int64{milestoneID}
 	}
 
@@ -438,37 +438,20 @@ func Issues(ctx *context.Context) {
 		return
 	}
 
-	renderMilestones(ctx)
+	var err error
-	if ctx.Written() {
-		return
-	}
-
-	ctx.Data["CanWriteIssuesOrPulls"] = ctx.Repo.CanWriteIssuesOrPulls(isPullList)
-
-	ctx.HTML(http.StatusOK, tplIssues)
-}
-
-func renderMilestones(ctx *context.Context) {
 	// Get milestones
-	milestones, _, err := issues_model.GetMilestones(issues_model.GetMilestonesOption{
+	ctx.Data["Milestones"], _, err = issues_model.GetMilestones(issues_model.GetMilestonesOption{
 		RepoID: ctx.Repo.Repository.ID,
-		State:  api.StateAll,
+		State:  api.StateType(ctx.FormString("state")),
 	})
 	if err != nil {
 		ctx.ServerError("GetAllRepoMilestones", err)
 		return
 	}
 
-	openMilestones, closedMilestones := issues_model.MilestoneList{}, issues_model.MilestoneList{}
+	ctx.Data["CanWriteIssuesOrPulls"] = ctx.Repo.CanWriteIssuesOrPulls(isPullList)
-	for _, milestone := range milestones {
+
-		if milestone.IsClosed {
+	ctx.HTML(http.StatusOK, tplIssues)
-			closedMilestones = append(closedMilestones, milestone)
-		} else {
-			openMilestones = append(openMilestones, milestone)
-		}
-	}
-	ctx.Data["OpenMilestones"] = openMilestones
-	ctx.Data["ClosedMilestones"] = closedMilestones
 }
 
 // RetrieveRepoMilestonesAndAssignees find all the milestones and assignees of a repository

templates/repo/issue/list.tmpl

@@ -63,7 +63,7 @@
 					</div>
 
 					<!-- Milestone -->
-					<div class="ui {{if not (or .OpenMilestones .ClosedMilestones)}}disabled{{end}} dropdown jump item">
+					<div class="ui {{if not .Milestones}}disabled{{end}} dropdown jump item">
 						<span class="text">
 							{{.locale.Tr "repo.issues.filter_milestone"}}
 							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -73,28 +73,9 @@
 								<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
 								<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_milestone"}}">
 							</div>
-							<div class="divider"></div>
+							<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_milestone_no_select"}}</a>
-							<a class="{{if not $.MilestoneID}}active selected {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone=0&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_milestone_all"}}</a>
+							{{range .Milestones}}
-							<a class="{{if $.MilestoneID}}{{if eq $.MilestoneID -1}}active selected {{end}}{{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone=-1&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_milestone_none"}}</a>
+								<a class="{{if $.MilestoneID}}{{if eq $.MilestoneID .ID}}active selected{{end}}{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.Name}}</a>
-							{{if .OpenMilestones}}
-								<div class="divider"></div>
-								<div class="header">{{.locale.Tr "repo.issues.filter_milestone_open"}}</div>
-								{{range .OpenMilestones}}
-								<a class="{{if $.MilestoneID}}{{if eq $.MilestoneID .ID}}active selected {{end}}{{end}}item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">
-									{{svg "octicon-milestone" 16 "mr-2"}}
-									{{.Name}}
-								</a>
-								{{end}}
-							{{end}}
-							{{if .ClosedMilestones}}
-								<div class="divider"></div>
-								<div class="header">{{.locale.Tr "repo.issues.filter_milestone_closed"}}</div>
-								{{range .ClosedMilestones}}
-								<a class="{{if $.MilestoneID}}{{if eq $.MilestoneID .ID}}active selected {{end}}{{end}}item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">
-									{{svg "octicon-milestone" 16 "mr-2"}}
-									{{.Name}}
-								</a>
-								{{end}}
 							{{end}}
 						</div>
 					</div>

templates/repo/issue/milestone/select_menu.tmpl

@@ -1,39 +0,0 @@
-<div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_milestone_title"}}</div>
-{{if or .OpenMilestones .ClosedMilestones}}
-	<div class="ui icon search input">
-		<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
-		<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_milestones"}}">
-	</div>
-	<div class="divider"></div>
-{{end}}
-<div class="no-select item">{{.locale.Tr "repo.issues.new.clear_milestone"}}</div>
-{{if and (not .OpenMilestones) (not .ClosedMilestones)}}
-	<div class="header" style="text-transform: none;font-size:14px;">
-		{{.locale.Tr "repo.issues.new.no_items"}}
-	</div>
-{{else}}
-	{{if .OpenMilestones}}
-		<div class="divider"></div>
-		<div class="header">
-			{{.locale.Tr "repo.issues.new.open_milestone"}}
-		</div>
-		{{range .OpenMilestones}}
-			<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">
-				{{svg "octicon-milestone" 16 "gt-mr-2"}}
-				{{.Name}}
-			</a>
-		{{end}}
-	{{end}}
-	{{if .ClosedMilestones}}
-		<div class="divider"></div>
-		<div class="header">
-			{{.locale.Tr "repo.issues.new.closed_milestone"}}
-		</div>
-		{{range .ClosedMilestones}}
-			<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">
-				{{svg "octicon-milestone" 16 "gt-mr-2"}}
-				{{.Name}}
-			</a>
-		{{end}}
-	{{end}}
-{{end}}

templates/repo/issue/new_form.tmpl

@@ -93,7 +93,44 @@
 					{{end}}
 				</span>
 				<div class="menu">
-					{{template "repo/issue/milestone/select_menu" .}}
+					<div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_milestone_title"}}</div>
+					{{if or .OpenMilestones .ClosedMilestones}}
+					<div class="ui icon search input">
+						<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
+						<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_milestones"}}">
+					</div>
+					{{end}}
+					<div class="no-select item">{{.locale.Tr "repo.issues.new.clear_milestone"}}</div>
+					{{if and (not .OpenMilestones) (not .ClosedMilestones)}}
+						<div class="header" style="text-transform: none;font-size:14px;">
+							{{.locale.Tr "repo.issues.new.no_items"}}
+						</div>
+					{{else}}
+						{{if .OpenMilestones}}
+							<div class="divider"></div>
+							<div class="header">
+								{{.locale.Tr "repo.issues.new.open_milestone"}}
+							</div>
+							{{range .OpenMilestones}}
+								<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">
+									{{svg "octicon-milestone" 16 "gt-mr-2"}}
+									{{.Name}}
+								</a>
+							{{end}}
+						{{end}}
+						{{if .ClosedMilestones}}
+							<div class="divider"></div>
+							<div class="header">
+								{{.locale.Tr "repo.issues.new.closed_milestone"}}
+							</div>
+							{{range .ClosedMilestones}}
+								<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">
+									{{svg "octicon-milestone" 16 "gt-mr-2"}}
+									{{.Name}}
+								</a>
+							{{end}}
+						{{end}}
+					{{end}}
 				</div>
 			</div>
 			<div class="ui select-milestone list">

templates/repo/issue/view_content/sidebar.tmpl

@@ -161,7 +161,44 @@
 				{{end}}
 			</a>
 			<div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/milestone">
-				{{template "repo/issue/milestone/select_menu" .}}
+				<div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_milestone_title"}}</div>
+				{{if or .OpenMilestones .ClosedMilestones}}
+				<div class="ui icon search input">
+					<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
+					<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_milestones"}}">
+				</div>
+				{{end}}
+				<div class="no-select item">{{.locale.Tr "repo.issues.new.clear_milestone"}}</div>
+				{{if and (not .OpenMilestones) (not .ClosedMilestones)}}
+					<div class="header" style="text-transform: none;font-size:14px;">
+						{{.locale.Tr "repo.issues.new.no_items"}}
+					</div>
+				{{else}}
+					{{if .OpenMilestones}}
+						<div class="divider"></div>
+						<div class="header">
+							{{.locale.Tr "repo.issues.new.open_milestone"}}
+						</div>
+						{{range .OpenMilestones}}
+							<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">
+								{{svg "octicon-milestone" 16 "gt-mr-2"}}
+								{{.Name}}
+							</a>
+						{{end}}
+					{{end}}
+					{{if .ClosedMilestones}}
+						<div class="divider"></div>
+						<div class="header">
+							{{.locale.Tr "repo.issues.new.closed_milestone"}}
+						</div>
+						{{range .ClosedMilestones}}
+							<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">
+								{{svg "octicon-milestone" 16 "gt-mr-2"}}
+								{{.Name}}
+							</a>
+						{{end}}
+					{{end}}
+				{{end}}
 			</div>
 		</div>
 		<div class="ui select-milestone list">