thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Merge pull request 'Update module github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker to v3 (forgejo)' (#4909) from renovate/forgejo-github.com-editorconfig-checker-editorconfig-checker-v2-cmd-editorconfig-checker-3.x into forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4909
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
This commit is contained in:
Gusted 2024-08-09 20:19:32 +00:00
commit 437b84a5f9
13 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.forgejo/workflows/release-notes-assistant-milestones.yml
View file

@ -20,9 +20,9 @@ jobs:
- name: apt install jq
run: |
export DEBIAN_FRONTEND=noninteractive
apt-get update -qq
apt-get -q install -y -qq jq
export DEBIAN_FRONTEND=noninteractive
apt-get update -qq
apt-get -q install -y -qq jq
- name: update open milestones
run: |

6
.forgejo/workflows/release-notes-assistant.yml
View file

@ -30,9 +30,9 @@ jobs:
- name: apt install jq
run: |
export DEBIAN_FRONTEND=noninteractive
apt-get update -qq
apt-get -q install -y -qq jq
export DEBIAN_FRONTEND=noninteractive
apt-get update -qq
apt-get -q install -y -qq jq
- name: release-notes-assistant preview
run: |

2
Makefile
View file

@ -27,7 +27,7 @@ DIFF ?= diff --unified
XGO_VERSION := go-1.21.x
AIR_PACKAGE ?= github.com/air-verse/air@v1 # renovate: datasource=go
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker@2.8.0 # renovate: datasource=go
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.0.3 # renovate: datasource=go
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.6.0 # renovate: datasource=go
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1 # renovate: datasource=go
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11 # renovate: datasource=go

2
templates/base/alert.tmpl
View file

@ -19,5 +19,5 @@
</div>
{{end}}
{{if and (not .Flash.ErrorMsg) (not .Flash.SuccessMsg) (not .Flash.InfoMsg) (not .Flash.WarningMsg) (not .IsHTMX)}}
<div id="flash-message" hx-swap-oob="true"></div>
<div id="flash-message" hx-swap-oob="true"></div>
{{end}}

2
templates/htmx/milestone_sidebar.tmpl
View file

@ -1,4 +1,4 @@
<div id="insert-timeline" hx-swap-oob="beforebegin">
{{template "repo/issue/view_content/comments" .}}
{{template "repo/issue/view_content/comments" .}}
</div>
{{template "repo/issue/view_content/sidebar/milestones" .}}

2
templates/org/menu.tmpl
View file

@ -6,7 +6,7 @@
{{if .RepoCount}}
<div class="ui small label">{{.RepoCount}}</div>
{{end}}
<span hidden test-name="repository-count">{{.RepoCount}}</span>
<span hidden test-name="repository-count">{{.RepoCount}}</span>
</a>
{{if .CanReadProjects}}
<a class="{{if .PageIsViewProjects}}active {{end}}item" href="{{$.Org.HomeLink}}/-/projects">

2
templates/repo/issue/view_content.tmpl
View file

@ -72,7 +72,7 @@
</div>
</div>
{{template "repo/issue/view_content/comments" .}}
{{template "repo/issue/view_content/comments" .}}
<div id="insert-timeline"></div>
{{if and .Issue.IsPull (not $.Repository.IsArchived)}}

2
templates/repo/issue/view_content/pull_merge_instruction.tmpl
View file

@ -1,6 +1,6 @@
<div class="divider"></div>
<details class="collapsible">
<summary class="tw-py-2"> {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} </summary>
<summary class="tw-py-2"> {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} </summary>
<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}</div>
{{$localBranch := .PullRequest.HeadBranch}}
{{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}

18
templates/repo/wiki/search.tmpl
View file

@ -1,12 +1,12 @@
{{if .Results}}
{{range .Results}}
<a class="item" href="{{$.RepoLink}}/wiki/{{.Filename}}">
<b class="tw-block tw-mb-2">{{.Filename}}</b>
{{range .LineCodes}}
<p class="tw-my-0">{{.}}</p>
{{end}}
</a>
{{end}}
{{range .Results}}
<a class="item" href="{{$.RepoLink}}/wiki/{{.Filename}}">
<b class="tw-block tw-mb-2">{{.Filename}}</b>
{{range .LineCodes}}
<p class="tw-my-0">{{.}}</p>
{{end}}
</a>
{{end}}
{{else}}
<div class="item muted">{{ctx.Locale.Tr "repo.wiki.no_search_results"}}</div>
<div class="item muted">{{ctx.Locale.Tr "repo.wiki.no_search_results"}}</div>
{{end}}

6
templates/shared/searchfile.tmpl
View file

@ -1,9 +1,9 @@
<div class="file-body file-code code-view">
<div>
<ol class="tw-p-0 tw-m-0">
{{/* if the expected line number does not match
the actual line number end the ordered list
and begin a new one */}}
{{/* if the expected line number does not match
the actual line number end the ordered list
and begin a new one */}}
{{$expNum := 0}}
{{range .SearchResult.Lines}}
{{if and (gt $expNum 0) (ne .Num $expNum)}}

2
templates/shared/user/profile_big_avatar.tmpl
View file

@ -1,5 +1,5 @@
{{if .IsHTMX}}
{{template "base/alert" .}}
{{template "base/alert" .}}
{{end}}
<div id="profile-avatar-card" class="ui card" hx-swap="morph">
<div id="profile-avatar" class="content tw-flex">