fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-09 16:55:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
18177 commits 10 branches 233 tags 597 MiB
Commit graph

18177 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lunny Xiao c9d9255244
Lazy load object format with command line and don't do it in OpenRepository (#29712) 
Most time, when invoking `git.OpenRepository`, `objectFormat` will not
be used, so it's a waste to invoke commandline to get the object format.
This PR make it a lazy operation, only invoke that when necessary.

(cherry picked from commit e84e5db6de0306d514b1f1a9657931fb7197a188)
 2024-03-20 08:46:28 +01:00
pengqiseven e825d007b1
remove repetitive words (#29695) 
Signed-off-by: pengqiseven <912170095@qq.com>
(cherry picked from commit 7f856d5d742dcb6febdb8a3f22cd9a8fecc69a4d)
 2024-03-20 08:46:28 +01:00
Zettat123 2559c80bec
Add a warning for disallowed email domains (#29658) 
Resolve #29660

Follow #29522 and #29609

Add a warning for disallowed email domains when admins manually add/edit
users.

Thanks @yp05327 for the
[comment](https://github.com/go-gitea/gitea/pull/29605#issuecomment-1980105119)

![image](https://github.com/go-gitea/gitea/assets/15528715/6737b221-a3a2-4180-9ef8-b846c10f96e0)

(cherry picked from commit 4129e0e79bbf30e4297efd33feb2602c40322d10)
 2024-03-20 08:46:28 +01:00
yp05327 b6e480fcbb
Fix inconsistent rendering of block mathematical expressions (#29677) 
Fix #28735

GitHub render `\```math\``` ` as a block now.
Add `display` class will render it as a block.

After:

![image](https://github.com/go-gitea/gitea/assets/18380374/2a1c20c7-438e-4ab1-8c66-cf91c8343087)

![image](https://github.com/go-gitea/gitea/assets/18380374/b81b8a93-8bca-46a5-b7db-e0d2f53e1342)

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 8fc1a8f0eb642c574610a346e858d42c433ebe01)
 2024-03-20 08:46:28 +01:00
Lunny Xiao 69ebc2f7d8
Use repo object format name instead of detecting from git repository (#29702) 
It's unnecessary to detect the repository object format from git
repository. Just use the repository's object format name.

(cherry picked from commit 3c6fc25a77c37d50686caa495d27a31dcef7f75f)

Conflicts:
	services/pull/pull.go
 2024-03-20 08:46:28 +01:00
Yarden Shoham 32dd02829e
Remove jQuery AJAX from the comment edit history (#29703) 
- Removed all jQuery AJAX calls and replaced with our fetch wrapper
- Tested the comment edit history list, diff, and delete functionality
and it works as before

# Demo using `fetch` instead of jQuery AJAX

![demo](https://github.com/go-gitea/gitea/assets/20454870/e8c557bc-f2b9-4d73-b55e-0850c1b19364)

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
(cherry picked from commit b5ed42864e306f22305beba50d6ff71df2aea0c6)
 2024-03-20 08:46:28 +01:00
0ko 26e4af4268
Fix heatmap localization 
Fixes #2552

(cherry picked from commit 708f4bc3b6)
 2024-03-20 08:20:08 +01:00
Codeberg Translate cc1c000ac8 [I18N] Translations update from Weblate (#2645) 
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: kita <kita@users.noreply.translate.codeberg.org>
Co-authored-by: Panagiotis \"Ivory\" Vasilopoulos <git@n0toose.net>
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: yeziruo <yeziruo@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <Fjuro@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <Gusted@users.noreply.translate.codeberg.org>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org>
Co-authored-by: Zughy <Zughy@users.noreply.translate.codeberg.org>
Co-authored-by: mumulhl <mumulhl@users.noreply.translate.codeberg.org>
Co-authored-by: mondstern <mondstern@users.noreply.translate.codeberg.org>
Co-authored-by: Kaede Fujisaki <ledyba@users.noreply.translate.codeberg.org>
Co-authored-by: Xinayder <Xinayder@users.noreply.translate.codeberg.org>
Co-authored-by: Mumulhl <mumulhl@duck.com>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2645
Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org>
Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>
 2024-03-20 06:53:53 +00:00
Earl Warren ba75514887
Revert "Fix heatmap localization" 
It conflicts with unmerged translations.

This reverts commit 708f4bc3b6.
 2024-03-20 07:31:23 +01:00
Earl Warren 19d7ff9c9e
[TESTS] testPullCreate do not assume the default branch is master 2024-03-20 06:52:37 +01:00
Denys Konovalov d3d0c4cbe7
add skip ci support for pull request title (#29774) 
Extends #28075 to support [skip ci] inside PR titles.

Close #29265

(cherry picked from commit 7a90e5954f8515329f20ff0e391130e1ee7b8864)

Conflicts:
	services/actions/notifier_helper.go
	tests/integration/actions_trigger_test.go
	conflicts easily resolved because of
	[TESTS] Convert more tests to CreateDeclarativeRepo
	[ACTIONS] skip superflous pull request synchronized event (#2314)
 2024-03-20 06:07:50 +01:00
Otto Richter 9e69ef9c51 Label stars/forks link in repo explore 2024-03-19 23:38:08 +01:00
Gusted 4c40a261d5 Merge pull request '[BUG] Fix manual merge button' (#2696) from gusted/forgejo-manual-merge into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2696
Reviewed-by: Otto <otto@codeberg.org>
 2024-03-19 18:43:27 +00:00
Gusted 9551c1a6f8
[BUG] Fix manual merge button 
- Add `form-fetch-action` to indicate that this form POST to an link
that returns JSON and thus should be handled by Javascript code.
- Found by @fnetx
- Regression of https://codeberg.org/forgejo/forgejo/pulls/1793
 2024-03-19 18:47:09 +01:00
Gusted 17ef8145a8 Merge pull request '[PORT] Refactor code_indexer to use an SearchOptions struct for PerformSearch (gitea#29724)' (#2686) from snematoda/port-29724 into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2686
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-03-19 17:42:50 +00:00
Gusted 7cfdd51dd9 Merge pull request 'Use separate keys for tabs on login screen' (#2630) from 0ko/forgejo:signintabs into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2630
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
 2024-03-19 14:56:03 +00:00
Earl Warren 1b74f8a266 Merge pull request '[CI] FORGEJO_VERSION drop "g" prefix' (#2694) from oliverpool/forgejo:drop_g_prefix_from_version into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2694
Reviewed-by: Otto <otto@codeberg.org>
 2024-03-19 13:25:03 +00:00
Earl Warren 2c80727e8f Merge pull request 'Plurals and translations for heatmap' (#2612) from 0ko/forgejo:oneisone into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2612
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
 2024-03-19 13:24:12 +00:00
Gusted 37172e792a Merge pull request 'Delete redundant snap packaging receipe' (#2693) from popey/forgejo:forgejo into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2693
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-03-19 11:28:24 +00:00
0ko 708f4bc3b6 Fix heatmap localization 
Fixes #2552
 2024-03-19 14:37:03 +05:00
oliverpool f3180fa1d6 [CI] FORGEJO_VERSION drop "g" prefix 
Added by git describe, but is confusing
 2024-03-19 10:36:45 +01:00
Alan Pope 0095dff5e8 Merge branch 'forgejo' into forgejo 2024-03-19 09:29:19 +00:00
Alan Pope f5e3a13f44 Delete redundant snap packaging receipe 
I'm working on the snap packaging over at https://codeberg.org/forgejo-contrib/snap  which makes this snapcraft.yaml outdated, redundant and potentially confusing for other developers.

Signed-off-by: Alan Pope <popey@noreply.codeberg.org>
 2024-03-19 09:16:02 +00:00
oliverpool ce6db31efe Merge pull request '[Port] Sync branches to DB immediately when handle git hook calling gitea#29493' (#2684) from oliverpool/forgejo:sync_branch into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2684
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-03-19 08:37:30 +00:00
Earl Warren e05396fcdd Merge pull request 'Fixes for project selector in sidebar' (#2608) from 0ko/forgejo:projectsfix into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2608
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
 2024-03-19 08:16:42 +00:00
Earl Warren 55f81e5a2e Merge pull request '[port] Improve CSV rendering (gitea#29638)' (#2687) from algernon/forgejo:gitea/port/29638 into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2687
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-03-19 08:14:20 +00:00
Earl Warren c16866d4a5 Merge pull request 'English fixes and improvements' (#2631) from 0ko/forgejo:english20240311 into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2631
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-03-19 08:09:27 +00:00
Ada 41676a8634 Fix #2512 /api/forgejo/v1/version auth check (#2582) 
Add the same auth check and middlewares as the /v1/ API.
It require to export some variable from /v1 API, i am not sure if is the correct way to do

Co-authored-by: oliverpool <git@olivier.pfad.fr>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2582
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Ada <ada@gnous.eu>
Co-committed-by: Ada <ada@gnous.eu>
 2024-03-19 07:16:19 +00:00
Gusted 1e292e9005 Merge pull request '[BUG] Make write and preview tabs interactive' (#2681) from gusted/forgejo-a11y-tabs into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2681
Reviewed-by: Otto <otto@codeberg.org>
 2024-03-18 21:57:36 +00:00
Jason Song 375222a145 Sync branches first (gitea#29714) 
Follow gitea#29493.

Sync branches to DB first, then trigger push events.
 2024-03-18 17:39:34 +01:00
oliverpool 66a135f6f2 [BUG] Restore deleted branches 2024-03-18 17:39:14 +01:00
oliverpool 0a53eb838d use gitRepo.GetCommit directly 
and give it a commitID instead of a branchName (a bit more correct and faster)
 2024-03-18 17:38:58 +01:00
Jason Song 286d09203f Sync branches to DB immediately when handle git hook calling (gitea#29493) 
Unlike other async processing in the queue, we should sync branches to
the DB immediately when handling git hook calling. If it fails, users
can see the error message in the output of the git command.

It can avoid potential inconsistency issues, and help #29494.

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2024-03-18 17:38:01 +01:00
Gusted 7db592b9fd Merge pull request 'Fix must-change-password help dialog' (#2676) from famfo/forgejo:forgejo into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2676
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
 2024-03-18 16:22:00 +00:00
Gusted 847d969a8f Merge pull request 'routers: Minor code cleanup in UsernameSubRoute' (#2685) from algernon/forgejo:cleanup/UsernameSubRoute into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2685
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-03-18 16:19:01 +00:00
Gergely Nagy f756c3c8d0
Do not override the background for .repository .data-table tr 
A previous commit (via gitea#29638) changed the `.repository .data-table
.tr` CSS rule to forcibly override the background to `none`. This, in
turn, disabled the even-odd row coloring.

Doing so should be a preference of the theme used, and should not be
enforced by the core CSS rules. This patch removes the override.

Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
 2024-03-18 14:15:27 +01:00
silverwind 602a6a92c2
Improve CSV rendering (#29638) 
Before:

<img width="1332" alt="Screenshot 2024-03-06 at 21 42 17"
src="https://github.com/go-gitea/gitea/assets/115237/0ea07eee-31f8-4783-bd56-37bd8396f00d">

After:
<img width="1336" alt="Screenshot 2024-03-06 at 21 41 58"
src="https://github.com/go-gitea/gitea/assets/115237/eb7f9cc9-587f-4e3b-92bd-cc67ca639963">
 2024-03-18 13:52:41 +01:00
Gergely Nagy 921d1283ed
routers: Minor code cleanup in UsernameSubRoute 
The `reloadParam` function already calls `context.UserAssignmentWeb`
with the same parameters, there's no need to do it again.

Change cherry picked from gitea#29751.

Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
 2024-03-18 13:28:20 +01:00
6543 d5319feb85 Refactor code_indexer to use an SearchOptions struct for PerformSearch (#29724) 
similar to how it's already done for the issue_indexer

---
*Sponsored by Kithara Software GmbH*

Conflicts:
	routers/web/repo/search.go
 2024-03-18 12:25:05 +00:00
Gusted b90fda395a
[BUG] Make write and preview tabs interactive 
- Make the 'Write' and 'Preview' tabs of the markdown editor interactive
by adding `href="#"`, this causes it to appear in the document order and
that while focused pressing `Enter` fires a click event (which isn't the
case by doing `tabindex="0"`).
- Resolves #2675
 2024-03-17 23:38:10 +01:00
0ko 4c1af0d9a6 [I18N] Fix capitalization in English and reword a few strings 
fixes #2551
 2024-03-17 21:04:11 +05:00
famfo e9bdca5f09
Fix must-change-password help dialog 2024-03-17 12:08:27 +01:00
Gusted 65f9319c8f Merge pull request '[Windows] prevent ? in testdata path' (#2668) from oliverpool/forgejo:prevent_windows_incompatibles_paths into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2668
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-03-15 14:40:53 +00:00
Gusted 314e5188d8 Merge pull request '[FIX] Display error message if doer is unable to fork' (#2649) from snematoda/fix-2504 into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2649
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
 2024-03-15 14:12:59 +00:00
oliverpool a3cdb5f2d3 [Windows] prevent ? in testdata path 2024-03-15 13:15:46 +01:00
Gusted d1e808f803 Merge pull request '[BUG] Use correct head commit for CODEOWNER' (#2658) from gusted/forgejo-codeowners-typo into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2658
Reviewed-by: Otto <otto@codeberg.org>
 2024-03-15 12:09:15 +00:00
Gusted cd7cdf06ed Merge pull request 'Fix milestone sorting translation keys' (#2644) from 0ko/forgejo:fix-the-sort-milestones-bug-noone-have-noticed-in-a-half-of-a-year into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2644
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
 2024-03-14 19:06:59 +00:00
0ko 008706a438 Offer to remove WIP: prefix in sidebar 
Fixes https://codeberg.org/forgejo/forgejo/issues/2654
 2024-03-14 20:59:57 +05:00
Gusted a4cc37b46a
[BUG] Use correct headcommitid 
Regression of #2507, which switched the HEAD from `pr.GetGitRefName()`
to `pr.HeadCommitID` but it had to be `prInfo.HeadCommitID`. Resolves #2656
I was able to reproduce this locally with _some_ pull requests, haven't
been able to get a reproducer trough integration testing.
 2024-03-14 16:15:56 +01:00
Shiny Nematoda 773048afa1 fix #2501 2024-03-14 12:34:41 +00:00