diff options
Diffstat (limited to 'modules/pull/merge.go')
| -rw-r--r-- | modules/pull/merge.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/pull/merge.go b/modules/pull/merge.go index cf2fb7fc4f..ef154128c7 100644 --- a/modules/pull/merge.go +++ b/modules/pull/merge.go @@ -21,7 +21,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "code.gitea.io/gitea/modules/timeutil" ) // Merge merges pull request to base repository. @@ -258,7 +258,7 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor return fmt.Errorf("GetBranchCommit: %v", err) } - pr.MergedUnix = util.TimeStampNow() + pr.MergedUnix = timeutil.TimeStampNow() pr.Merger = doer pr.MergerID = doer.ID |