diff options
| author | 0ko <0ko@noreply.codeberg.org> | 2024-03-29 19:07:01 +0100 |
|---|---|---|
| committer | 0ko <0ko@noreply.codeberg.org> | 2024-04-01 14:46:02 +0200 |
| commit | 4b09dd11ec77fd5758d307aac29202ae23cdc619 (patch) | |
| tree | cc4247a5b74832e2435a1966f485a67e13857691 /routers | |
| parent | Merge pull request '[TESTS] disable test failure on log.Error for now' (#2942... (diff) | |
| download | forgejo-4b09dd11ec77fd5758d307aac29202ae23cdc619.tar.xz forgejo-4b09dd11ec77fd5758d307aac29202ae23cdc619.zip | |
[GITEA] Apply changes to archived labels
This is a squashed result of conflict resolution for the following commits from Gitea:
- https://github.com/go-gitea/gitea/commit/36de5b299bb3e6e6cf28062c832ab8165e83f91a
- https://github.com/go-gitea/gitea/commit/9a93b1816e0bc65101e7ad7ca66786fb38a8e628
- https://github.com/go-gitea/gitea/commit/712e19fa6fbf2f1a5b0a471782d38a7d91e538ae
- https://github.com/go-gitea/gitea/commit/83850cc4799285d766d0fb5751fff10a6e4d3353
It is lacking CSS rule for archived labels, though.
Changes in this commit are authored by:
- 6543
- delvh
- silverwind
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/web/repo/issue_label.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/routers/web/repo/issue_label.go b/routers/web/repo/issue_label.go index 9dedaefa4b..81bee4dbb5 100644 --- a/routers/web/repo/issue_label.go +++ b/routers/web/repo/issue_label.go @@ -13,7 +13,6 @@ import ( "code.gitea.io/gitea/modules/label" "code.gitea.io/gitea/modules/log" repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/forms" @@ -112,12 +111,11 @@ func NewLabel(ctx *context.Context) { } l := &issues_model.Label{ - RepoID: ctx.Repo.Repository.ID, - Name: form.Title, - Exclusive: form.Exclusive, - Description: form.Description, - Color: form.Color, - ArchivedUnix: timeutil.TimeStamp(0), + RepoID: ctx.Repo.Repository.ID, + Name: form.Title, + Exclusive: form.Exclusive, + Description: form.Description, + Color: form.Color, } if err := issues_model.NewLabel(ctx, l); err != nil { ctx.ServerError("NewLabel", err) |