Gusted
c2e7f1a0be
Merge pull request 'Replace IfZero with cmp.Or' ( #2854 ) from snematoda/revert-ifzero into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2854
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-03-28 12:43:32 +00:00
Gusted
42b97fd836
Merge pull request '[COSMETIC] unify the wording of the Forgejo migration comments' ( #2849 ) from earl-warren/forgejo:wip-migration-comments into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2849
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-28 12:36:57 +00:00
Shiny Nematoda
db7e6948a1
replace IfZero with cmp.Or
2024-03-28 11:58:26 +00:00
Shiny Nematoda
a38260aed9
Revert "cherry pick only IfZero
from ( #29755 )"
...
This reverts commit 82851f429a
.
2024-03-28 11:46:41 +00:00
Earl Warren
1684f0e5bf
Merge pull request '[PERFORMANCE] git check-attr on bare repo if supported' ( #2763 ) from oliverpool/forgejo:check_attr_bare into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2763
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-28 11:14:52 +00:00
Earl Warren
ba458530aa
[COSMETIC] unify the wording of the Forgejo migration comments
2024-03-28 12:08:43 +01:00
Earl Warren
26f6a3b578
Merge pull request 'Revert "avoid superfluous synchronized pull_request run when opening a PR"' ( #2848 ) from earl-warren/forgejo:wip-revert-bad-race-fix into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2848
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-03-28 10:38:55 +00:00
oliverpool
be6434662a
[REFACTOR] webhook/new remove redundant if
2024-03-28 11:13:37 +01:00
oliverpool
9558b18d22
[REFACTOR] webhook move templates
2024-03-28 11:13:37 +01:00
oliverpool
3c81f7478c
[PERFORMANCE] git check-attr on bare repo if supported
2024-03-28 10:52:51 +01:00
Earl Warren
327deee2d7
Merge pull request '[PORT] Support repo code search without setting up an indexer (gitea#29998)' ( #2813 ) from snematoda/port-git-grep into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2813
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-28 08:15:47 +00:00
wxiaoguang
eb21829800
Fix git grep search limit, add test ( #30071 )
...
Fix #30069
2024-03-28 07:48:35 +00:00
Earl Warren
ceea9c4334
Revert "avoid superfluous synchronized pull_request run when opening a PR"
...
The fix against the race incorrectly assumes the sha of the commit being
pushed belongs to the base repository. It finds the highest possible
pull request ID from the head repository instead of looking it up in
the base repository.
Figuring out if a PR was created in the future based on the highest
index of the base repository would require collecting all of them
because there is no way to know in advance which repository may be
involved in the race.
Fixing this race can be done either by:
* Introducing a new field in the pull_request table https://codeberg.org/forgejo/forgejo/pulls/2842
which feels more like a hack than a real solution
* Refactoring the logic
which would be a significant undertaking
The race has been in the codebase for a very long time and manifests
itself in the CI, when events happen in quick succession. The only
concrete manifestation was however fixed by https://codeberg.org/forgejo/forgejo/issues/2009
Since this race now only exists in theory and not in practice, let's
revert this bugous commit until a proper solution is implemented.
Fixes: https://codeberg.org/forgejo/forgejo/issues/2817
This reverts commit 036f1eddc5
.
Conflicts:
services/pull/pull.go
2024-03-28 07:08:17 +01:00
Earl Warren
57e7650d70
Merge pull request '[REFACTOR] webhook endpoint logic cleanup' ( #2847 ) from oliverpool/forgejo:webhook_4_cleanup_endpoints into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2847
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-28 05:46:00 +00:00
Shiny Nematoda
82851f429a
cherry pick only IfZero
from ( #29755 )
...
original commit:
Author: wxiaoguang <wxiaoguang@gmail.com>
Date: Thu Mar 14 09:10:51 2024 +0800
Add test for webhook (#29755 )
Follow #29690
2024-03-28 05:21:52 +00:00
wxiaoguang
1e7a6483b8
Support repo code search without setting up an indexer ( #29998 )
...
By using git's ability, end users (especially small instance users) do
not need to enable the indexer, they could also benefit from the code
searching feature.
Fix #29996
![image](https://github.com/go-gitea/gitea/assets/2114189/11b7e458-88a4-480d-b4d7-72ee59406dd1 )
![image](https://github.com/go-gitea/gitea/assets/2114189/0fe777d5-c95c-4288-a818-0427680805b6 )
---------
Co-authored-by: silverwind <me@silverwind.io>
2024-03-28 05:16:51 +00:00
Shiny Nematoda
488a99fb56
Reverts commits releated to git-grep
...
This reverts commit
51fb6f3983
71a72d8a22f2ba5d08415542371f3529a01571dd
2024-03-28 05:09:41 +00:00
oliverpool
bc36f85b5f
[REFACTOR] webhook repo naming consistency
2024-03-27 22:26:55 +01:00
oliverpool
9c3611ec50
[REFACTOR] simplify checkHookType
2024-03-27 22:26:55 +01:00
oliverpool
c0dd92e9c5
[REFACTOR] webhook move edit endpoints
2024-03-27 22:26:55 +01:00
oliverpool
635230ca5d
[TESTS] webhook forms keep submitted data when invalid
2024-03-27 22:26:55 +01:00
oliverpool
1e050d01c0
[REFACTOR] merge once-called functions
2024-03-27 22:26:54 +01:00
Gusted
9d82059840
[BUG] Do not allow deletion of internal references
...
- Currently it's possible to modify remote references such as
`refs/pull/<idx>/head` and `refs/heads/<branch>`.
- Disallow that the pull request reference is deleted, as this should
not be at the control of the user. Doing so would result in
inconsistencies within Forgejo and lead to internal server errors when
trying access the pull request, this action should be reserved for
Forgejo.
- Do this by utilizing the `update` hook, which process each reference
individually and therefore allow to only skip deleting internal
references and still allow other modifications that is being done in
the same push.
- Ref: https://codeberg.org/Codeberg/Community/issues/1517
2024-03-27 18:27:00 +01:00
Earl Warren
883cb2d542
Merge pull request '[REFACTOR] webhook settings: merge Create/Update endpoints' ( #2843 ) from oliverpool/forgejo:webhook_3_endpoint_merge into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2843
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-27 17:21:09 +00:00
oliverpool
4ab341e971
[REFACTOR] webhook gogs endpoint
2024-03-27 15:38:39 +01:00
oliverpool
dce754cde1
[REFACTOR] webhook packagist endpoint
2024-03-27 15:38:39 +01:00
oliverpool
36a1d37532
[REFACTOR] webhook wechatwork endpoint
2024-03-27 15:38:39 +01:00
oliverpool
6b719f08d0
[REFACTOR] webhook feishu endpoint
2024-03-27 15:38:39 +01:00
oliverpool
97f0ad49ff
[REFACTOR] webhook msteams endpoint
2024-03-27 15:38:39 +01:00
oliverpool
46b71ec709
[REFACTOR] webhook telegram endpoint
2024-03-27 15:38:39 +01:00
oliverpool
9dff719523
[REFACTOR] webhook dingtalk endpoint
2024-03-27 15:38:39 +01:00
oliverpool
c3f8e6ed60
[REFACTOR] webhook discord endpoint
2024-03-27 15:38:39 +01:00
oliverpool
6f00821f3d
[REFACTOR] webhook slack endpoints
2024-03-27 15:38:38 +01:00
oliverpool
7e0965b02c
[REFACTOR] webhook forgejo/gitea endpoints
2024-03-27 15:38:38 +01:00
oliverpool
8dfbbfef07
[REFACTOR] webhook matrix endpoints
2024-03-27 15:38:38 +01:00
Earl Warren
e41e18f87e
Merge pull request '[REFACTOR] webhook.Handler interface' ( #2758 ) from oliverpool/forgejo:webhook_2_interface into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2758
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-27 13:45:04 +00:00
Earl Warren
50de5046d7
Merge pull request 'Improve localization of repo summary' ( #2756 ) from 0ko/forgejo:i18n-repository-summary into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2756
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-27 13:35:54 +00:00
Earl Warren
ee6c238f03
Merge pull request '[port] gitea#29969: repo header/list refactor' ( #2839 ) from algernon/forgejo:gitea/port/29969/refactor-repo-header-list into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2839
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-27 10:06:24 +00:00
Earl Warren
82ecfd7481
Merge pull request 'models/forgejo_migrations: Gitea tables migration ID' ( #2838 ) from earl-warren/forgejo:wip-forgejo-migrations-index into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2838
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-03-27 10:03:20 +00:00
Gergely Nagy
2692ee3791
Further consistency in the repo header
...
The recent refactor imported from Gitea made the Fork counter/button in
the repo header appear as icon only on mobile, but left the Star & Watch
buttons unchanged, so they appeared with text. That resulted in the
mobile view looking a bit awkward, with half the widgets (rss & fork) as
icon-only, while the other half (star & watch) with both icon and text.
This changes the other two in the same way: to appear without text on
mobile.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-03-27 09:33:06 +01:00
Earl Warren
d6eab2b586
models/forgejo_migrations: Gitea tables migration ID
...
Sync() will act on the given struct and the ID field should be exactly
as it is in the Gitea migration when a Gitea table is modified.
2024-03-27 09:27:32 +01:00
wxiaoguang
65e190ae8b
Refactor repo header/list ( #29969 )
...
1. Use general "mobile-only" and "not-mobile" CSS styles, remove some`@media (max-width: 767.98px)` tricks
2. Use `CountFmt` for repo list, just like the repo header (and it matches GitHub, to avoid big numbers bloat the page)
(cherry picked from commit bfa160fc98a23923b6ce1cd4d99e8970d937d6ec)
Conflicts:
templates/explore/repo_list.tmpl
templates/repo/header.tmpl
web_src/css/repo/header.css
Resolved the template conflicts by porting the changes to Forgejo (in
case of `header.tmpl`, applying the changes in `header_fork.tmpl). In
case of the CSS change, opted to take Gitea's version and drop the
entire media query.
2024-03-27 09:22:24 +01:00
Renovate Bot
e3570ec3e3
Update ghcr.io/visualon/renovate Docker tag to v37.272.0
2024-03-27 07:32:23 +00:00
Earl Warren
d5a3f14063
Merge pull request 'Update module github.com/klauspost/compress to v1.17.7' ( #2824 ) from renovate/github.com-klauspost-compress-1.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2824
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-27 06:34:48 +00:00
Earl Warren
ac672fc3ff
Merge pull request '[ACTIONS] port scheduled actions from Gitea' ( #2826 ) from earl-warren/forgejo:wip-gitea-schedule into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2826
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-27 06:23:56 +00:00
Earl Warren
8339b24d61
Merge pull request '[gitea] week 13 cherry-pick' ( #2769 ) from earl-warren/forgejo:wip-gitea-cherry-pick into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2769
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-03-26 18:45:57 +00:00
Codeberg Translate
3015788523
[I18N] Translations update from Weblate ( #2830 )
...
Translations update from [Weblate](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>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2830
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-03-26 18:38:16 +00:00
Gusted
828d0f8364
Merge pull request 'Add missing translation for more_items' ( #2828 ) from 0ko/forgejo:more_items into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2828
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-26 18:37:21 +00:00
wxiaoguang
6243973899
Fix comment review avatar alignment ( #29935 )
...
Fix #29934
(cherry picked from commit bc55a80693aded26efd856812097536e2402d491)
Conflicts:
templates/repo/issue/view_content/comments.tmpl
trivial context conflict
2024-03-26 19:04:28 +01:00
Earl Warren
522eb73ec9
lint: apply lint-frontend-fix
2024-03-26 19:04:28 +01:00