diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index 18fc1b3e73d1..bad6342aad44 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -282,9 +282,22 @@ To add custom .gitignore, add a file with existing [.gitignore rules](https://gi ### Labels -To add a custom label set, add a file that follows the [label format](https://github.com/go-gitea/gitea/blob/main/options/label/Default) to `$GITEA_CUSTOM/options/label` +Starting with Gitea 1.19, you can add a file that follows the [YAML label format](https://github.com/go-gitea/gitea/blob/main/options/label/Advanced.yaml) to `$GITEA_CUSTOM/options/label`: + +```yaml +labels: + - name: "foo/bar" # name of the label that will appear in the dropdown + exclusive: true # whether to use the exclusive namespace for scoped labels. scoped delimiter is / + color: aabbcc # hex colour coding + description: Some label # long description of label intent + ``` + +The [legacy file format](https://github.com/go-gitea/gitea/blob/main/options/label/Default) can still be used following the format below, however we strongly recommend using the newer YAML format instead. + `#hex-color label name ; label description` +For more information, see the [labels documentation]({{< relref "doc/usage/labels.en-us.md" >}}). + ### Licenses To add a custom license, add a file with the license text to `$GITEA_CUSTOM/options/license` diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 6449d12de105..046100c72e2f 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -205,7 +205,7 @@ func DeleteProject(ctx *context.Context) { } ctx.JSON(http.StatusOK, map[string]interface{}{ - "redirect": ctx.Repo.RepoLink + "/projects", + "redirect": ctx.ContextUser.HomeLink() + "/-/projects", }) } diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index 7ca47cd32c56..25f459c09c56 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -4,7 +4,7 @@ {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} - {{svg "octicon-project"}} {{.locale.Tr "user.projects"}} + {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} {{if .IsPackageEnabled}} diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 8d9594e2b477..489189ec45a1 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -12,7 +12,7 @@ {{template "base/alert" .}}
- {{svg "octicon-project" 16 "gt-mr-3"}} + {{svg "octicon-project-symlink" 16 "gt-mr-3"}} {{JsPrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} @@ -38,7 +38,7 @@
{{range .Projects}}
  • - {{svg "octicon-project"}} {{.Title}} + {{svg "octicon-project-symlink"}} {{.Title}}
    {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index a01d2165795b..ffabe534c8bb 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -7,7 +7,7 @@
    - {{.Title}} + {{- .Title -}} {{if .RefLink}} diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 4e6879650ddc..afd471368fa8 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -79,7 +79,7 @@ {{$isExpandable := or (gt $file.Addition 0) (gt $file.Deletion 0) $file.IsBin}}

    -
    +
    {{if $file.ShouldBeHidden}} {{svg "octicon-chevron-right" 18}} @@ -96,7 +96,7 @@ {{template "repo/diff/stats" dict "file" . "root" $}} {{end}}
    - {{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.locale.Tr "repo.stored_lfs"}}){{end}} + {{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.locale.Tr "repo.stored_lfs"}}){{end}} {{if $file.IsGenerated}} {{$.locale.Tr "repo.diff.generated"}} {{end}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 24c7ac7e4ed4..9fd6c99a5b3f 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -176,8 +176,8 @@ {{.locale.Tr "repo.issues.new.open_projects"}}
    {{range .OpenProjects}} - - {{svg "octicon-project" 18 "gt-mr-3"}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Title}} {{end}} @@ -188,8 +188,8 @@ {{.locale.Tr "repo.issues.new.closed_projects"}}

    {{range .ClosedProjects}} - - {{svg "octicon-project" 18 "gt-mr-3"}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Title}} {{end}} @@ -201,8 +201,8 @@ {{.locale.Tr "repo.issues.new.no_projects"}}
    {{if .Project}} - - {{svg "octicon-project" 18 "gt-mr-3"}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Project.Title}} {{end}} diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index fc4770e5d8d4..929a1b4c6fb8 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -40,7 +40,7 @@
    {{range .Projects}}
  • - {{svg "octicon-project"}} {{.Title}} + {{svg "octicon-project"}} {{.Title}}
    {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 6f3fd0f9167d..16bb3c1ec7fe 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -87,8 +87,8 @@ {{end}} {{if .Project}} - - {{svg "octicon-project" 14 "gt-mr-2"}}{{.Project.Title}} + + {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 14 "gt-mr-2"}}{{else}}{{svg "octicon-project" 14 "gt-mr-2"}}{{end}}{{.Project.Title}} {{end}} {{if .Ref}} diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 2449f5fc323e..ce9ecb46adbc 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -23,7 +23,7 @@ {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} - {{svg "octicon-project"}} {{.locale.Tr "user.projects"}} + {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} {{if (not .UnitPackagesGlobalDisabled)}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index fcaec60eaec4..5b445bdb0078 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -107,7 +107,7 @@ {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} - {{svg "octicon-project"}} {{.locale.Tr "user.projects"}} + {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} {{if .IsPackageEnabled}} diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue new file mode 100644 index 000000000000..3717b6495661 --- /dev/null +++ b/web_src/js/components/ActionRunStatus.vue @@ -0,0 +1,30 @@ + + + diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index a5c12c754ece..aadc8369b75e 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -2,10 +2,7 @@
    - - - - +
    {{ run.title }}
    @@ -23,12 +20,7 @@
    - - - - - - + {{ job.name }}