Backupppert/Forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-07-05 05:23:15 +02:00
Code Issues Packages Projects Releases Wiki Activity
19159 commits 31 branches 221 tags 589 MiB
Commit graph

1398 commits

Author SHA1 Message Date
erik b878e74f76 Merge branch 'forgejo-federated-star' of codeberg.org:meissa/forgejo into forgejo-federated-star 2024-04-12 14:33:57 +02:00
erik 71141a5ff3 WIP Refactoring and solving (adding) ToDos 2024-04-12 14:33:47 +02:00
erik feca77b040 Rename for clearer semantics 2024-04-12 13:58:55 +02:00
Michael Jerger 37420442de unify copyright comment 2024-04-12 13:52:26 +02:00
erik 80888b80d6 Fix imports 2024-04-09 16:00:28 +02:00
erik af0d0f7745 Merge branch 'forgejo' into forgejo-federated-star 2024-04-09 15:38:11 +02:00
erik 97343470bc Merge branch 'forgejo' into forgejo-federated-star 2024-04-09 10:42:42 +02:00
Earl Warren 26fc7c3461 Merge pull request '[gitea] week 15 cherry pick' (#3091) from algernon/forgejo:wcp/week-15 into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3091
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-09 05:31:44 +00:00
JakobDev 613e5387c5 Count downloads for tag archives 2024-04-08 12:51:27 +02:00
sebastian-sauer 300c8dedfd
Commit-Dropdown: Show Author of commit if available (#30272) 
As in commits page we show the author of the commit in the commits
dropdown and not the committer.

Commits Page:
![Screenshot from 2024-04-03
22-34-41](https://github.com/go-gitea/gitea/assets/1135157/1c7c5c19-6d0a-4176-8a87-7bca6a0c6dc8)

and the same contents in our dropdown:

![image](https://github.com/go-gitea/gitea/assets/1135157/aa094af2-c369-47ac-9c27-ca208d1d03f0)

fixes #29588

(cherry picked from commit 07bcfc171bcccfe78a86c7b4b3f9b729ba7d60b6)
 2024-04-07 15:40:31 +02:00
Zettat123 87870ade49
Remove scheduled action tasks if the repo is archived (#30224) 
Fix #30220

(cherry picked from commit 1ef2eb50d82d07b1e4ff312ef58953d1bba2437a)
 2024-04-07 15:40:31 +02:00
sillyguodong 16696a42f5
Add API for Variables (#29520) 
close #27801

---------

Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 62b073e6f31645e446c7e8d6b5a506f61b47924e)

Conflicts:
	- modules/util/util.go
          Trivial resolution, only picking the newly introduced function
	- routers/api/v1/swagger/options.go
          Trivial resolution. We don't have UserBadges, don't pick that part.
	- templates/swagger/v1_json.tmpl
          Regenerated.
 2024-04-07 10:57:53 +02:00
TheFox0x7 5f05196915 Add vars context to cron jobs (#3059) 
Introduce vars context into cron triggered actions

Fixes #3044

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3059
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: TheFox0x7 <thefox0x7@gmail.com>
Co-committed-by: TheFox0x7 <thefox0x7@gmail.com>
 2024-04-06 19:54:53 +00:00
Gusted d8eebe7698 Merge pull request 'Add optional pronoun field in user settings' (#1518) from hazy/forgejo:feat/pronoun-field into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1518
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Gergely Nagy <algernon@noreply.codeberg.org>
 2024-04-06 12:23:54 +00:00
Michael Jerger 213fc3a97d Merge branch 'forgejo-federated-star' of codeberg.org:meissa/forgejo into forgejo-federated-star 2024-04-06 10:59:41 +02:00
Michael Jerger c908455998 fix multiple federation in one host 2024-04-06 10:59:36 +02:00
Earl Warren 6077d10be3 Merge pull request 'feat: improve nuget nuspec api' (#2996) from viceice/forgejo:feat/nuget/nuspec-api into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2996
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-04-06 07:48:31 +00:00
Earl Warren 668edc1948 Merge pull request 'Refactor LFS GC functions' (#3056) from gusted/forgejo-lfs into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3056
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-06 07:27:22 +00:00
Earl Warren a015ada29a Merge pull request '[BUG] fix webhook creation payload ref' (#3055) from oliverpool/forgejo:webhook_fix_create_payload_ref into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3055
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-06 07:25:20 +00:00
Gusted 6af8f3a3f2
[BUG] Don't remove builtin OAuth2 applications 
- When the database consistency is being run it would check for any
OAuth2 applications that don't have an existing user. However there are
few special OAuth2 applications that don't have an user set, because
they are global applications.
- This was not taken into account by the database consistency checker
and were removed if the database consistency check was being run with
autofix enabled.
- Take into account to ignore these global OAuth2 applications when
running the database consistency check.
- Add unit tests.
- Ref: https://codeberg.org/Codeberg/Community/issues/1530
 2024-04-06 01:07:45 +02:00
Michael Kriese bc72fd7f46
feat: improve nuget nuspec api 2024-04-05 23:39:45 +02:00
Earl Warren 8205ed9495 Merge pull request '[FEAT] sourcehut webhooks' (#3022) from oliverpool/forgejo:webhook_7_sourcehut into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3022
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
 2024-04-05 19:23:54 +00:00
erik 765298814c Add ToDo 2024-04-05 17:07:04 +02:00
erik 33c60ebdff Add logging 2024-04-05 17:06:57 +02:00
Gusted 7ffa7f5bce
Refactor LFS GC functions 
- Remove options that currently aren't set
on `GarbageCollectLFSMetaObjectsOptions` and
`IterateLFSMetaObjectsForRepoOptions`.
- Simplify `IterateRepositoryIDsWithLFSMetaObjects` and
`IterateLFSMetaObjectsForRepo`.
- `IterateLFSMetaObjectsForRepo` was previously able to get in a
loop (`gc-lfs` doctor check was able to reproduce this) because the code
expected that the records would be updated to not match the SQL query,
but that wasn't the case. Simply enforce that only records higher than
the latest `id` from the previous iteration are allowed.
- For `gc-lfs` doctor check this was because `UpdatedLessRecentlyThan`
option was not set, which caused that records just marked as active in
the iteration weren't being filtered.
- Add unit tests
- Most likely a regression from 2cc3a6381c.
- The bug with `gc-lfs` was found on Codeberg.
 2024-04-05 16:49:15 +02:00
oliverpool 2c85a1417b [FIX] webhook creation payload ref 2024-04-05 16:21:41 +02:00
oliverpool ed9dd0e62a [FEAT] sourcehut webhooks 2024-04-05 10:20:40 +02:00
Earl Warren 4ccb8c8b1f Merge pull request '[FEAT] Add label filters in organization issues dashboard' (#2944) from iminfinity/forgejo:add/label-filters into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2944
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-04-04 16:58:12 +00:00
Michael Kriese e226a27233
feat: add optional storage init to doctor commands 2024-04-04 17:21:12 +02:00
Clemens 92d011f1a5 fix some linting issues 2024-04-04 15:08:02 +02:00
iminfinity 8d13ed4a8d add label filters in org/{org_name}/issues 2024-04-04 17:57:11 +05:30
oliverpool 04a398a1af [REFACTOR] webhook shared code to prevent import cycles 2024-04-04 08:24:33 +02:00
Clemens 73cf1e3901 Revert "added repoUri to federationService" 
This reverts commit 8cd89bf4d3.
 2024-04-04 07:22:04 +02:00
Gergely Nagy 6aba69ce85
Enable user pronoun editing from the admin ui 
While users can edit their own pronouns, the admin UI enables an admin
to edit *any* user setting. As such, pronouns should be editable here,
too.

For the sake of simplicity, the input here is a simple text input field,
rather than a dropdown.

Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
 2024-04-03 15:18:02 -05:00
Gergely Nagy efa9649696
services/convert/user: Convert pronouns properly 
When converting from a `user_model.User` to `api.User` or
`api.UserSettings`, convert the `Pronouns` field too.

Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
 2024-04-03 15:18:01 -05:00
hazycora f8e48e066a
add pronoun field to user profiles 2024-04-03 15:11:17 -05:00
Clemens 8cd89bf4d3 added repoUri to federationService 
This does not work yet. APAPI url OR host and id have to be derived from repoUri.
 2024-04-03 15:39:37 +02:00
Clemens 2b7a22afb3 renamed FederatedRepo to FollowingRepo 2024-04-03 12:26:33 +02:00
erik daccaed157 Rename federatedRepo to followingRepo 2024-04-03 12:08:44 +02:00
Michael Jerger 7a142c876e remove federated user in case of user deletion 2024-04-02 18:36:22 +02:00
Clemens 431b4c2829 optimize function 2024-04-02 12:38:06 +02:00
Clemens 962cd374e2 delete federated repos when deleting repository 2024-04-02 12:36:04 +02:00
Earl Warren ec091b59af Merge pull request '[FEAT] Configure if protected branch rule should apply to admins' (#2867) from gusted/forgejo-protectedbranch-admins into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2867
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-01 19:28:29 +00:00
Earl Warren 2e744dc991 Merge pull request 'Render inline file permalinks' (#2669) from Mai-Lapyst/forgejo:markup-add-filepreview into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2669
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-01 13:57:01 +00:00
oliverpool 120fa61a0a [REFACTOR] add Icon to webhook.Interface 2024-03-30 15:59:56 +01:00
Kemal Zebari 23676bfea7
Prevent re-review and dismiss review actions on closed and merged PRs (#30065) 
Resolves #29965.

---
Manually tested this by:
- Following the
[installation](https://docs.gitea.com/next/installation/install-with-docker#basics)
guide (but built a local Docker image instead)
- Creating 2 users, one who is the `Owner` of a newly-created repository
and the other a `Collaborator`
- Had the `Collaborator` create a PR that the `Owner` reviews
- `Collaborator` resolves conversation and `Owner` merges PR

And with this change we see that we can no longer see re-request review
button for the `Owner`:

<img width="1351" alt="Screenshot 2024-03-25 at 12 39 18 AM"
src="https://github.com/go-gitea/gitea/assets/60799661/bcd9c579-3cf7-474f-a51e-b436fe1a39a4">

(cherry picked from commit 242b331260925e604150346e61329097d5731e77)
 2024-03-30 07:17:32 +01:00
Lunny Xiao ef800a7ff1
Fix possible data race on tests (#30093) 
(cherry picked from commit 0c8b828f5d5ac7eb8e251edfb1f2536ce1c30336)
 2024-03-30 07:17:30 +01:00
yp05327 e93e29822d
Fix duplicate migrated milestones (#30102) 
Fix #17567

(cherry picked from commit 274bc00ca2c3bf5a734d74e47cc28fa8c41e3875)
 2024-03-30 07:17:30 +01:00
yp05327 1360e31091
Fix gitea doctor will remove repo-avatar files when execute command storage-archives (#30094) 
Fix #30037

(cherry picked from commit 9cf0f0bb040162509702ec9aaf7df6662ecc13b1)
 2024-03-30 07:17:30 +01:00
yp05327 eb696438fe
Fix panic for fixBrokenRepoUnits16961 (#30068) 
![image](https://github.com/go-gitea/gitea/assets/18380374/508b3ceb-f53d-4d3b-a781-97c1542af1cb)

(cherry picked from commit 08aec2c20adae8e6f04cac08566a8decd818e5cd)
 2024-03-30 07:17:30 +01:00