TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
20605 commits 17 branches 219 tags 581 MiB
Commit graph

20605 commits

This branch
This branch
All branches
Author SHA1 Message Date
Otto
2cbc9cec73 Merge pull request 'Enable switch check in linter' (#4555) from thefox/reenable-switch-check into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4555
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
 2024-08-18 15:56:35 +00:00
Gusted
22d57cfc6b Merge pull request 'chore(make): structure and clean up Makefile a little' (#4979) from fnetx/makefile-structure into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4979
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-08-18 15:27:02 +00:00
Gusted
15c64122a6
[BUG] Don't fire notification for comment of pending review 
- When a comment was updated or deleted and was part of an
pending/ongoing review, it would have triggered a notification, such as
a webhook.
- This patch checks if the comment is part of a pending review and then
does not fire a notification and, in the case of updating a comment,
does not save the content history because this is not necessary if it is
still a "draft" comment given it is a pending comment (there is no need
to see my embarrassing typos).
- Adds integration tests.
- Resolves https://codeberg.org/forgejo/forgejo/issues/4368
 2024-08-18 17:04:00 +02:00
TheFox0x7
f7bb75ce56
revert: accidental change 2024-08-18 16:36:06 +02:00
Gusted
fe18428806
Fix linting issues 2024-08-18 16:25:13 +02:00
TheFox0x7
529bbbde4d
style: change one argument switch to if 2024-08-18 16:20:26 +02:00
Renovate Bot
674689af4a
Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v1.60.1 2024-08-18 16:03:29 +02:00
TheFox0x7
0813126058
test: add more workflow event coverage 2024-08-18 15:19:01 +02:00
TheFox0x7
8322882265
style: reenable switch check 2024-08-18 15:19:01 +02:00
Otto Richter
7e0cebecb0 Drop docker target from Makefile 
as per https://codeberg.org/forgejo/forgejo/pulls/4979#issuecomment-2181764
 2024-08-18 15:14:34 +02:00
Earl Warren
adf4dcdbbf Merge pull request 'Update docker.io/bitnami/minio Docker tag to v2024.8.17 (forgejo)' (#4994) from renovate/forgejo-docker.io-bitnami-minio-2024.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4994
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-08-18 05:24:26 +00:00
Earl Warren
5ae1c96893
chore(renovate): bitnami/minio is now docker.io/bitnami/minio 2024-08-18 06:37:45 +02:00
Adrian Hirt
1dfa11551c
Fix overflowing content in action run log (#31842) 
When a long line with characters such as dots is returned by a step in
an action (e.g. by the output of the Ruby on Rails test runner), it
overflows the log container, causing the page to scroll sideways.

This PR adds the CSS `overflow-wrap: anywhere;` to the
`.job-step-section .job-step-logs .job-log-line .log-msg` selector,
which causes such lines to wrap as well

(cherry picked from commit 61aaf3440142d225802e3e9ce3db28bcf71f5a7e)
 2024-08-18 06:28:26 +02:00
Jason Song
385718dd78
Avoid returning without written ctx when posting PR (#31843) 
Fix #31625.

If `pull_service.NewPullRequest` return an error which misses each `if`
check, `CompareAndPullRequestPost` will return immediately, since it
doesn't write the HTTP response, a 200 response with empty body will be
sent to clients.

```go
	if err := pull_service.NewPullRequest(ctx, repo, pullIssue, labelIDs, attachments, pullRequest, assigneeIDs); err != nil {
		if repo_model.IsErrUserDoesNotHaveAccessToRepo(err) {
			ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err.Error())
		} else if git.IsErrPushRejected(err) {
			// ...
			ctx.JSONError(flashError)
		} else if errors.Is(err, user_model.ErrBlockedUser) {
			// ...
			ctx.JSONError(flashError)
		} else if errors.Is(err, issues_model.ErrMustCollaborator) {
			// ...
			ctx.JSONError(flashError)
		}
		return
	}
```

Not sure what kind of error can cause it to happen, so this PR just
expose it. And we can fix it when users report that creating PRs failed
with error responses.

It's all my guess since I cannot reproduce the problem, but even if it's
not related, the code here needs to be improved.

(cherry picked from commit acd7053e9d4968e8b9812ab379be9027ac8e7771)

Conflicts:
	routers/web/repo/pull.go
  trivial context conflict
 2024-08-18 06:28:26 +02:00
Lunny Xiao
d5500422c9
Fix panic of ssh public key page after deletion of auth source (#31829) 
Fix #31730

This PR rewrote the function `PublicKeysAreExternallyManaged` with a
simple test. The new function removed the loop to make it more readable.

(cherry picked from commit b491b2104f83ee8fc4956c099c427b339291b3be)
 2024-08-18 06:28:26 +02:00
Rowan Bohde
ebfdc659d8
render plain text file if the LFS object doesn't exist (#31812) 
We had an issue where a repo was using LFS to store a file, but the user
did not push the file. When trying to view the file, Gitea returned a
500 HTTP status code referencing `ErrLFSObjectNotExist`. It appears the
intent was the render this file as plain text, but the conditional was
flipped. I've also added a test to verify that the file is rendered as
plain text.

(cherry picked from commit 1310649331648d747c57a52ea3bc92da85e7d4d1)

Conflicts:
	tests/integration/lfs_view_test.go
  trivial context conflict
 2024-08-18 05:58:33 +02:00
Jason Song
7f1db1df3e
Show lock owner instead of repo owner on LFS setting page (#31788) 
Fix #31784.

Before:

<img width="1648" alt="image"
src="https://github.com/user-attachments/assets/03f32545-4a85-42ed-bafc-2b193a5d8023">

After:

<img width="1653" alt="image"
src="https://github.com/user-attachments/assets/e5bcaf93-49cb-421f-aac1-5122bc488b02">

(cherry picked from commit 0470646d46f90c20f40fde718be6ef8d8c84ee2c)
 2024-08-18 05:47:06 +02:00
Renovate Bot
2960f78adb Update docker.io/bitnami/minio Docker tag to v2024.8.17 2024-08-18 00:02:17 +00:00
Otto
4760c5029d Merge pull request 'i18n: Improve clarity of confirmation email messages' (#4980) from fnetx/activation-code-clarity into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4980
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-08-17 15:31:48 +00:00
Otto
2f501e9d74 Merge pull request 'fix: add gap between branch dropdown and PR button' (#4971) from n0toose/gap-part-two into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4971
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Caesar Schinas <caesar@caesarschinas.com>
 2024-08-17 12:11:05 +00:00
Earl Warren
9b66710bf5 Merge pull request 'Update docker.io/bitnami/mysql Docker tag to v8.4 (forgejo)' (#4961) from renovate/forgejo-docker.io-bitnami-mysql-8.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4961
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-08-17 07:46:57 +00:00
Earl Warren
fbb2252314 Merge pull request 'git-grep: fix for initial dashes in expressions' (#4967) from yoctozepto/git-grep-fix-words into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4967
Reviewed-by: Shiny Nematoda <snematoda@noreply.codeberg.org>
 2024-08-17 07:07:40 +00:00
Earl Warren
e2dee395e4 Merge pull request 'Update docker.io/bitnami/minio Docker tag to v2024.8.3 (forgejo)' (#4960) from renovate/forgejo-docker.io-bitnami-minio-2024.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4960
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-08-17 06:58:28 +00:00
Earl Warren
022d7c16ca Merge pull request 'Update module mvdan.cc/gofumpt to v0.7.0 (forgejo)' (#4988) from renovate/forgejo-mvdan.cc-gofumpt-0.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4988
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-08-17 05:18:56 +00:00
Earl Warren
3524bfaf0c Merge pull request 'Update dependency @playwright/test to v1.46.1 (forgejo)' (#4987) from renovate/forgejo-playwright-monorepo into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4987
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-08-17 05:18:35 +00:00
Gusted
760b99bd5a Merge pull request 'test: fail on unhandled JS exceptions' (#4959) from solomonv/e2e-fail-on-errors into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4959
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Caesar Schinas <caesar@caesarschinas.com>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-08-17 00:58:18 +00:00
Renovate Bot
1b8a79f820 Update module mvdan.cc/gofumpt to v0.7.0 2024-08-17 00:02:59 +00:00
Renovate Bot
c078e14472 Update dependency @playwright/test to v1.46.1 2024-08-17 00:02:44 +00:00
Otto
da7f3ac6f5 Merge pull request '[BUG] Make logout event non-blocking' (#4938) from gusted/forgejo-non-blocking-logout into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4938
Reviewed-by: Otto <otto@codeberg.org>
 2024-08-16 14:17:15 +00:00
Otto Richter
2e9f4cece4 i18n: Improve clarity of confirmation email messages 
Fixes https://codeberg.org/forgejo/forgejo/issues/4399
 2024-08-16 16:11:18 +02:00
Otto Richter
b390641478 Drop vendor filter (dir is gone), left-align help messages 2024-08-16 15:28:48 +02:00
Otto Richter
ac5d4f68d1 Comments for structure, moving things around, drop Gitea mentions 2024-08-16 15:04:25 +02:00
Otto Richter
f2ab8c8ea7 Drop legacy update-translation target 2024-08-16 14:54:55 +02:00
Earl Warren
24eb401a0a Merge pull request 'Enhancing Gitea OAuth2 Provider with Granular Scopes for Resource Access' (#4449) from marcellmars/forgejo:forgejo into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4449
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-08-16 12:38:15 +00:00
Earl Warren
8e91cf1b26 Merge pull request 'Add .mailmap with aliases for Unknwon (github.com/Unknwon)' (#4956) from yarikoptic/forgejo:enh-mailmap into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4956
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-08-16 09:04:41 +00:00
Earl Warren
c7fe944357 Merge pull request 'Update dependency @stylistic/eslint-plugin-js to v2.6.4 (forgejo)' (#4972) from renovate/forgejo-eslint-stylistic-monorepo into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4972
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-08-16 08:58:42 +00:00
Earl Warren
b2b83dfb94 Merge pull request 'Update dependency stylelint to v16.8.2 (forgejo)' (#4973) from renovate/forgejo-linters into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4973
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-08-16 08:57:59 +00:00
Earl Warren
95dc22370e Merge pull request 'Update dependency @eslint-community/eslint-plugin-eslint-comments to v4.4.0 (forgejo)' (#4975) from renovate/forgejo-eslint-community-eslint-plugin-eslint-comments-4.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4975
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-08-16 08:57:19 +00:00
forgejo-renovate-action
f7f6c78913 Merge pull request 'Update dependency vue to v3.4.38 (forgejo)' (#4974) from renovate/forgejo-patch-vue-monorepo into forgejo 2024-08-16 08:56:36 +00:00
Renovate Bot
5bb7fc2a39 Update dependency vue to v3.4.38 2024-08-16 08:03:23 +00:00
Codeberg Translate
17fa75074d i18n: update of translations from Codeberg Translate (#4889) 
Translations update from [Codeberg Translate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/).

Current translation status:

![Weblate translation status](https://translate.codeberg.org/widget/forgejo/forgejo/horizontal-auto.svg)

Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Co-authored-by: Panagiotis \"Ivory\" Vasilopoulos <git@n0toose.net>
Co-authored-by: dragon <dragon@users.noreply.translate.codeberg.org>
Co-authored-by: hoovad <hoovad@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: hugoalh <hugoalh@users.noreply.translate.codeberg.org>
Co-authored-by: zub <zub@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4889
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org>
Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>
 2024-08-16 07:19:03 +00:00
Renovate Bot
07d6557804 Update dependency @eslint-community/eslint-plugin-eslint-comments to v4.4.0 2024-08-16 02:03:27 +00:00
Renovate Bot
c4a5da969a Update dependency @stylistic/eslint-plugin-js to v2.6.4 2024-08-16 02:03:01 +00:00
Renovate Bot
4fa2b8f70e Update dependency stylelint to v16.8.2 2024-08-16 00:03:27 +00:00
Panagiotis "Ivory" Vasilopoulos
18cad9d342 fix: add gap between branch dropdown and PR button 
The saga continues.

The motivation for adding a bigger gap is making the gap consistent
with the "Watch"/"Fork"/"Star" buttons on the top right.
 2024-08-16 01:26:41 +02:00
Gusted
0924e6626d Merge pull request 'fix: enlargen gap between avatar and name' (#4958) from n0toose/latest-commit-gap into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4958
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Caesar Schinas <caesar@caesarschinas.com>
 2024-08-15 19:18:22 +00:00
Otto
d26ad8dbe5 Merge pull request 'git-grep: set timeout to 2s by default and allow configuring it' (#4966) from yoctozepto/git-grep-timeout into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4966
Reviewed-by: Otto <otto@codeberg.org>
 2024-08-15 12:15:16 +00:00
Renovate Bot
7614efcaf6 Update docker.io/bitnami/mysql Docker tag to v8.4 2024-08-15 00:03:35 +00:00
Renovate Bot
da44a7c01b Update docker.io/bitnami/minio Docker tag to v2024.8.3 2024-08-15 00:03:08 +00:00
Solomon Victorino
750deb9367 test: fail on unhandled JS exceptions 2024-08-14 15:35:20 -06:00