merge origin/master

Author: adelowo

models/migrations/v93.go

@@ -5,8 +5,7 @@
 package migrations
 
 import (
-	"code.gitea.io/gitea/modules/util"
-
+	"code.gitea.io/gitea/modules/timeutil"
 	"github.com/go-xorm/xorm"
 )
 
@@ -33,9 +32,9 @@ func addProjectsTable(x *xorm.Engine) error {
 
 		Type ProjectType
 
-		ClosedDateUnix util.TimeStamp
-		CreatedUnix    util.TimeStamp `xorm:"INDEX created"`
-		UpdatedUnix    util.TimeStamp `xorm:"INDEX updated"`
+		ClosedDateUnix timeutil.TimeStamp
+		CreatedUnix    timeutil.TimeStamp `xorm:"INDEX created"`
+		UpdatedUnix    timeutil.TimeStamp `xorm:"INDEX updated"`
 	}
 
 	type Issue struct {
@@ -50,8 +49,8 @@ func addProjectsTable(x *xorm.Engine) error {
 		// Not really needed but helpful
 		CreatorID int64 `xorm:"NOT NULL"`
 
-		CreatedUnix util.TimeStamp `xorm:"INDEX created"`
-		UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+		CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+		UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
 	}
 
 	if err := x.Sync(new(Project)); err != nil {

models/projects.go

@@ -6,7 +6,7 @@ package models
 
 import (
 	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/modules/util"
+	"code.gitea.io/gitea/modules/timeutil"
 	"github.com/go-xorm/xorm"
 )
 
@@ -22,8 +22,8 @@ type ProjectBoard struct {
 	// Not really needed but helpful
 	CreatorID int64 `xorm:"NOT NULL"`
 
-	CreatedUnix util.TimeStamp `xorm:"INDEX created"`
-	UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+	CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+	UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
 }
 
 const (
@@ -76,9 +76,9 @@ type Project struct {
 
 	RenderedContent string `xorm:"-"`
 
-	CreatedUnix    util.TimeStamp `xorm:"INDEX created"`
-	UpdatedUnix    util.TimeStamp `xorm:"INDEX updated"`
-	ClosedDateUnix util.TimeStamp
+	CreatedUnix    timeutil.TimeStamp `xorm:"INDEX created"`
+	UpdatedUnix    timeutil.TimeStamp `xorm:"INDEX updated"`
+	ClosedDateUnix timeutil.TimeStamp
 }
 
 // AfterLoad is invoked from XORM after setting the value of a field of
@@ -165,8 +165,8 @@ func createBoardsForProjectsType(sess *xorm.Session, project *Project) error {
 
 	for _, v := range items {
 		boards = append(boards, ProjectBoard{
-			CreatedUnix: util.TimeStampNow(),
-			UpdatedUnix: util.TimeStampNow(),
+			CreatedUnix: timeutil.TimeStampNow(),
+			UpdatedUnix: timeutil.TimeStampNow(),
 			CreatorID:   project.CreatorID,
 			Title:       v,
 			ProjectID:   project.ID,

routers/repo/projects.go

@@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/markup/markdown"
 	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/modules/util"
+	"code.gitea.io/gitea/modules/timeutil"
 )
 
 const (
@@ -142,7 +142,7 @@ func ChangeProjectStatus(ctx *context.Context) {
 		ctx.Redirect(ctx.Repo.RepoLink + "/projects?state=open")
 	case "close":
 		if !p.IsClosed {
-			p.ClosedDateUnix = util.TimeStampNow()
+			p.ClosedDateUnix = timeutil.TimeStampNow()
 			if err = models.ChangeProjectStatus(p, true); err != nil {
 				ctx.ServerError("ChangeProjectStatus", err)
 				return