mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-15 06:26:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
21094 commits 19 branches 233 tags 621 MiB
Commit graph

21094 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gergely Nagy
d3417688d6 Remove URLs from translations, part two 
Followup to gitea#31950, replacing URLs in translations with
placeholders, for all languages

Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
 2024-09-12 17:33:30 +05:00
Gergely Nagy
1c896b94b9 locale: Fix auths.tip.discord in the hu-HU translation 
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
 2024-09-12 17:29:52 +05:00
Gergely Nagy
b6b5d47dca Remove HTML tags from create branch and tag translations 
This is a followup to gitea#31973, and removes the HTML tags for the
rest of the languages too.

Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
 2024-09-12 17:29:52 +05:00
Denys Konovalov
8857da871e Remove urls from translations (#31950) 
Part of #27700

Removes all URLs from translation strings to easy up changing them in
the future and to exclude people injecting malicious URLs through
translations. First measure as long as #24402 is out of scope.

(cherry picked from commit 83f37f630246e381eefd650fc2d4b1f3976ea882)
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>

Conflicts:
	- options/locale/locale_en-US.ini
	  Resolved by manually applying the URL->%s changes to our translations.
	- routers/web/admin/hooks.go
	  templates/repo/settings/protected_branch.tmpl
	  templates/status/500.tmpl
	  Manually resolved.
	- templates/repo/settings/webhook/settings.tmpl
	  Applied the change to templates/webhook/shared-settings.tmpl
	  instead

Additional changes: Gitea-specific URLs have been replaced by their
Forgejo counterparts, lifted from the original translation text.
 2024-09-12 17:28:58 +05:00
Lunny Xiao
32320bbf32 Remove html tags from create tag and branch translation (#31973) 
Follow #31950 and Fix the display bug of #31966 .

This will only fix the English version. I will update all these
translation files in crowdin after this merged so that all the languages
can be fixed.

And all these files should be backported together.

This PR remove the bold effect around the name when creating a new tag
or branch.

(cherry picked from commit a366af4b7a067227386184067e203091923b5b10)
 2024-09-12 17:28:58 +05:00
Codeberg Translate
2d3fc00d02 i18n: update of translations from Codeberg Translate (#5231) 
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: xtex <xtexchooser@duck.com>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: Monti <contact@montidaproot.xyz>
Co-authored-by: muhaaliss <muhaaliss@users.noreply.translate.codeberg.org>
Co-authored-by: EssGeeEich <EssGeeEich@users.noreply.translate.codeberg.org>
Co-authored-by: Zughy <Zughy@users.noreply.translate.codeberg.org>
Co-authored-by: Marco Ciampa <ciampix@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5231
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org>
Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>
 2024-09-12 12:26:49 +00:00
Renovate Bot
0564beb98c Update module github.com/buildkite/terminal-to-html/v3 to v3.16.2 2024-09-12 12:02:33 +00:00
Michael Kriese
fbbaecf25a Merge pull request 'Update module github.com/jhillyerd/enmime to v1.3.0 (forgejo)' (#5206) from renovate/forgejo-github.com-jhillyerd-enmime-1.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5206
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-09-12 11:49:15 +00:00
Michael Kriese
192a5ea68b Merge pull request 'tests(e2e): Allow running in parallel' (#5288) from fnetx/e2e-parallel into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5288
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
 2024-09-12 11:48:41 +00:00
Otto
c98996f0d2 Merge pull request 'Improve textarea paste (part of gitea#31948)' (#5269) from algernon/forgejo:gitea/port/31948-partial into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5269
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
 2024-09-12 11:15:53 +00:00
Michael Kriese
acfa3e3167 Merge pull request 'tests(e2e): use playwright image for dependency caching' (#5297) from fnetx/playwright-cache-image into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5297
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
 2024-09-12 11:03:26 +00:00
Michael Kriese
978e65d690 Merge pull request 'Update module github.com/xanzy/go-gitlab to v0.109.0 (forgejo)' (#5193) from renovate/forgejo-github.com-xanzy-go-gitlab-0.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5193
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
 2024-09-12 11:01:32 +00:00
Gusted
74d12c7973 Merge pull request 'Update module google.golang.org/grpc to v1.66.2 (forgejo)' (#5299) from renovate/forgejo-google.golang.org-grpc-1.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5299
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
 2024-09-12 10:37:27 +00:00
Michael Kriese
dcadae9136 Merge pull request 'Update dependency sortablejs to v1.15.3 (forgejo)' (#5200) from renovate/forgejo-sortablejs-1.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5200
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-09-12 08:06:05 +00:00
forgejo-renovate-action
e90bebd574 Merge pull request 'Update dependency happy-dom to v15.7.4 (forgejo)' (#5296) from renovate/forgejo-happy-dom-15.x into forgejo 2024-09-12 07:24:14 +00:00
forgejo-renovate-action
c0ccfbba7d Merge pull request 'Update dependency eslint-plugin-github to v5.0.2 (forgejo)' (#5295) from renovate/forgejo-linters into forgejo 2024-09-12 07:23:32 +00:00
Michael Kriese
d2e2b51983 Merge pull request 'Update dependency tailwindcss to v3.4.11 (forgejo)' (#5298) from renovate/forgejo-tailwindcss-3.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5298
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
 2024-09-12 07:22:40 +00:00
Renovate Bot
ae5c919785 Update module google.golang.org/grpc to v1.66.2 2024-09-12 02:02:24 +00:00
Renovate Bot
d4082b79fc Update dependency tailwindcss to v3.4.11 2024-09-12 02:01:49 +00:00
Otto Richter
d14b17e08d tests(e2e): use playwright image for dependency caching 2024-09-12 03:16:51 +02:00
Renovate Bot
c7a4f6f94b Update dependency happy-dom to v15.7.4 2024-09-12 00:02:22 +00:00
Renovate Bot
de652e4833 Update dependency eslint-plugin-github to v5.0.2 2024-09-12 00:02:09 +00:00
Otto
742991abca Merge pull request 'Fix bad spacing on new release page' (#5261) from maltejur/forgejo:push-nnnyrrvzlqqy into forgejo
Some checks are pending
Integration tests for the release process / release-simulation (push) Waiting to run
Details
/ release (push) Waiting to run
Details
testing / backend-checks (push) Waiting to run
Details
testing / frontend-checks (push) Waiting to run
Details
testing / test-unit (push) Blocked by required conditions
Details
testing / test-remote-cacher (map[image:docker.io/bitnami/redis:7.2 port:6379]) (push) Blocked by required conditions
Details
testing / test-remote-cacher (map[image:docker.io/bitnami/valkey:7.2 port:6379]) (push) Blocked by required conditions
Details
testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Blocked by required conditions
Details
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (push) Blocked by required conditions
Details
testing / test-mysql (push) Blocked by required conditions
Details
testing / test-pgsql (push) Blocked by required conditions
Details
testing / test-sqlite (push) Blocked by required conditions
Details
testing / security-check (push) Blocked by required conditions
Details 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5261
Reviewed-by: Otto <otto@codeberg.org>
 2024-09-11 22:21:43 +00:00
Otto Richter
3ff15d03f3 tests(e2e): assert URL paste behaviour 2024-09-11 21:44:10 +02:00
Otto Richter
3695f5d096 Parallelize playwright tests 
- allow running with multiple workers (tested with up to four workers locally which
  didn't show signs of flakiness)
- prevent race condition with webauthn tests (running them in parallel
  on the same user could prevent another test from logging in)
- fix flakiness on CI action status (Chromium sometimes needs a long
  time to fill the href field, firefox is always faster)

This reverts commit e8585eff5c.
 2024-09-11 16:53:51 +02:00
Earl Warren
a46a9ef307 Merge pull request 'Revert "fix: CI: temporarily disable redict tests"' (#5289) from earl-warren/forgejo:wip-redict into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5289
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
 2024-09-11 14:27:14 +00:00
Earl Warren
2f49437608
Revert "fix: CI: temporarily disable redict tests" 
This reverts commit 9d306bbec3.
 2024-09-11 15:45:07 +02:00
Otto
83e9e9230a Merge pull request 'tests(e2e): remove unnecessary example test' (#5287) from fnetx/e2e-unnecessary into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5287
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-09-11 13:12:48 +00:00
Otto Richter
e4234fe6ab tests(e2e): remove unnecessary example test 
The login behaviour is basically covered in login_user from utils_e2e.js, too.
 2024-09-11 14:30:29 +02:00
Otto
a87b351476 Merge pull request 'fix: Migrate scoped GitLab labels as scoped Forgejo labels' (#4978) from mkobel/forgejo:migrate-scoped-gitlab-labels into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4978
Reviewed-by: Otto <otto@codeberg.org>
 2024-09-11 11:48:15 +00:00
Otto Richter
a62521f241 New release form semantics 
- correctly render labels without help text
- accessibility: fix external release button focus
- accessibility: test form aspects in browser test
 2024-09-11 13:30:30 +02:00
Malte Jürgens
28643cc276 Fix bad spacing on new release page 2024-09-11 13:30:30 +02:00
Earl Warren
abd08e6fd8 Merge pull request '[gitea] week 2024-37 cherry pick (gitea/main -> forgejo)' (#5263) from algernon/wcp/2024-37 into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5263
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
 2024-09-11 10:34:35 +00:00
forgejo-renovate-action
65829c2e3e Merge pull request 'Update dependency vue to v3.5.4 (forgejo)' (#5281) from renovate/forgejo-patch-vue-monorepo into forgejo 2024-09-11 08:34:32 +00:00
Renovate Bot
8c3920d26e Update dependency vue to v3.5.4 2024-09-11 08:01:37 +00:00
Earl Warren
c413aaa5bf Merge pull request 'fix: CI: temporarily disable redict tests' (#5284) from earl-warren/forgejo:wip-redict into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5284
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
 2024-09-11 06:09:56 +00:00
Earl Warren
9d306bbec3
fix: CI: temporarily disable redict tests 
Refs: https://codeberg.org/redict/redict-containers/issues/32
 2024-09-11 07:33:57 +02:00
forgejo-renovate-action
41f7f3f793 Merge pull request 'Update dependency @stylistic/eslint-plugin-js to v2.8.0 (forgejo)' (#5277) from renovate/forgejo-linters into forgejo 2024-09-11 04:50:33 +00:00
forgejo-renovate-action
f8eb608a5b Merge pull request 'Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v1.61.0 (forgejo)' (#5282) from renovate/forgejo-github.com-golangci-golangci-lint-cmd-golangci-lint-1.x into forgejo 2024-09-11 04:47:33 +00:00
forgejo-renovate-action
e159fdfd82 Merge pull request 'Update x/tools to v0.25.0 (forgejo)' (#5283) from renovate/forgejo-xtools into forgejo 2024-09-11 04:42:15 +00:00
Renovate Bot
54f3284faa Update x/tools to v0.25.0 2024-09-11 02:02:38 +00:00
Renovate Bot
0f10e9a72f Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v1.61.0 2024-09-11 00:02:45 +00:00
Renovate Bot
031914a012 Update dependency @stylistic/eslint-plugin-js to v2.8.0 2024-09-10 16:04:53 +00:00
Shiny Nematoda
6178a46fe2 feat: set fuzzy as default for issue search (#5270) 
Closes #5225

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5270
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Shiny Nematoda <snematoda.751k2@aleeas.com>
Co-committed-by: Shiny Nematoda <snematoda.751k2@aleeas.com>
 2024-09-10 15:57:58 +00:00
Renovate Bot
630595a7f3 Update dependency license-checker-rseidelsohn to v4.4.2 (forgejo) (#5274) 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5274
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
 2024-09-10 04:54:38 +00:00
Lunny Xiao
5f312250eb
Use forum.gitea.com instead of old URL (#31989) 
(cherry picked from commit a5818470fe62677d8859b590b2d80b98fe23d098)
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>

Conflicts:
	- .github/ISSUE_TEMPLATE/bug-report.yaml
	  .github/ISSUE_TEMPLATE/config.yml
	  .github/ISSUE_TEMPLATE/feature-request.yaml
	  .github/ISSUE_TEMPLATE/ui.bug-report.yaml
	  templates/install.tmpl
      All of these are Gitea-specific. Resolved the conflict by not
      picking their change.
 2024-09-09 20:54:47 +02:00
Adam Majer
5f3a2aafdf
Return 404 instead of error when commit not exist (#31977) 
Fix #31976

(cherry picked from commit bf7ae0429cdf236510aa6702e499878bc2345a6e)
 2024-09-09 20:54:47 +02:00
6543
3c8eb46765
For consistency make repo search sort options case sensitive (#31951) 
(cherry picked from commit 19af5344623ba999f418520fad1a3bde77980561)
 2024-09-09 20:54:47 +02:00
6543
4098098f00
nix wording nit in todo code comment 
(cherry picked from commit c0db47bf9b6eb59d822ad21b7dd8b1d6acd8ad8e)
 2024-09-09 20:54:39 +02:00
yp05327
5a0bc35799
Fix sort order for organization home and user profile page (#31921) 
Fix #31916

In #30876, `sortOrder` has been changed into a map, but it is only
implemented in explore.
~~But it seems that size sort order has no effect from long long ago,~~
not directly caused by the PR above.

I think it is still caused by #29231.
In #29231, it merged the sort orders from
`templates/explore/repo_search.tmpl` and
`templates/admin/repo/search.tmpl`.
In `templates/admin/repo/search.tmpl`, it contains size sort orders, but
not in `templates/explore/repo_search.tmpl`, which is used in non-admin
pages.
So `order by size` is added from #29231, but the handler was not added.

---------

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 661a1e10f7abd3527d2abc027dec936022db9379)
 2024-09-09 20:54:39 +02:00