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
Earl Warren
b2312f32c4
Merge pull request 'English improvements' ( #2703 ) from 0ko/forgejo:english20240320 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2703
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-31 08:10:51 +00:00
Earl Warren
ae96a5e725
Merge pull request '[REFACTOR] add Icon to webhook.Interface' ( #2908 ) from oliverpool/forgejo:webhook_6_icon_method into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2908
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-31 06:22:51 +00:00
Codeberg Translate
03cac08b1d
[I18N] Translations update from Weblate ( #2841 )
...
Translations update from [Weblate](https://translate.codeberg.org ) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/ ).
Current translation status:
Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org>
Co-authored-by: kita <kita@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <Fjuro@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: yeziruo <yeziruo@users.noreply.translate.codeberg.org>
Co-authored-by: Salif Mehmed <mail@salif.eu>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org>
Co-authored-by: Kaede Fujisaki <ledyba@users.noreply.translate.codeberg.org>
Co-authored-by: cherryb <cherryb@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2841
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-31 06:16:47 +00:00
0ko
d183d32c58
[I18N] English improvements
2024-03-30 20:54:04 +05:00
oliverpool
69115baf41
[REFACTOR] use Icon from interface in webhook list
2024-03-30 16:00:06 +01:00
Denys Konovalov
8ffb9c6fb1
Add default board to new projects, remove uncategorized pseudo-board ( #29874 )
...
On creation of an empty project (no template) a default board will be
created instead of falling back to the uneditable pseudo-board.
Every project now has to have exactly one default boards. As a
consequence, you cannot unset a board as default, instead you have to
set another board as default. Existing projects will be modified using a
cron job, additionally this check will run every midnight by default.
Deleting the default board is not allowed, you have to set another board
as default to do it.
Fixes #29873
Fixes #14679 along the way
Fixes #29853
Co-authored-by: delvh <dev.lh@web.de>
(cherry picked from commit e5160185ed65fd1c2bcb2fc7dc7e0b5514ddb299)
Conflicts:
options/locale/locale_en-US.ini
trivial conflict because Forgejo strings do not have
surrounding double quotes
2024-03-30 07:17:31 +01:00
Gusted
6c55347377
[BRANDING] Move docs.gitea.com to forgejo.org/docs
...
- Replace links from docs.gitea.com with forgejo.org/docs for those
where the relevant links are available on the Forgejo documentation.
- Resolves #2892
2024-03-30 01:56:25 +01:00
Gusted
79b7089360
[FEAT] Configure if protected branch rule should apply to admins
...
- Currently protected branch rules do not apply to admins, however in
some cases (like in the case of Forgejo project) you might also want to
apply these rules to admins to avoid accidental merges.
- Add new option to configure this on a per-rule basis.
- Adds integration tests.
- Resolves #65
2024-03-29 00:21:49 +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
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
---------
Co-authored-by: silverwind <me@silverwind.io>
2024-03-28 05:16:51 +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
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
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:
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
Zettat123
8848b0ea2b
Fix bugs in rerunning jobs ( #29955 )
...
Fix #28761
Fix #27884
Fix #28093
## Changes
### Rerun all jobs
When rerun all jobs, status of the jobs with `needs` will be set to
`blocked` instead of `waiting`. Therefore, these jobs will not run until
the required jobs are completed.
### Rerun a single job
When a single job is rerun, its dependents should also be rerun, just
like GitHub does
(https://github.com/go-gitea/gitea/issues/28761#issuecomment-2008620820 ).
In this case, only the specified job will be set to `waiting`, its
dependents will be set to `blocked` to wait the job.
### Show warning if every job has `needs`
If every job in a workflow has `needs`, all jobs will be blocked and no
job can be run. So I add a warning message.
<img
src="https://github.com/go-gitea/gitea/assets/15528715/88f43511-2360-465d-be96-ee92b57ff67b "
width="480px" />
(cherry picked from commit 2f060c5834d81f0317c795fc281f9a07e03e5962)
2024-03-26 19:04:26 +01:00
yp05327
64fcf0cb64
Update register application URL for GitLab ( #29959 )
...
Fix #26593
The old URL was updated 7 years ago. Maybe no need to hold it any more.
(cherry picked from commit 4bef1fb3e49127316596cef1d3ca103a199c0536)
2024-03-26 19:04:26 +01:00
wxiaoguang
e5920b4a62
Refactor StringsToInt64s ( #29967 )
...
And close #27176
(cherry picked from commit cdb4d1a8db096d60dba04728924dab85def45b19)
2024-03-26 19:04:26 +01:00
buckybytes
0d3ddec26c
Editor error message misleading due to re-used key. ( #29859 )
...
The error message:
`editor.file_changed_while_editing = The file contents have changed
since you started editing. <a target="_blank" rel="noopener noreferrer"
href="%s">Click here</a> to see them or <strong>Commit Changes
again</strong> to overwrite them.`
Is re-used in inappropriate contexts. The link in the key goes to a 404
when the key is used in a situation where the file contents have not
changed.
Added two new keys to differentiate commit id mismatch and push out of
date conditions.
(cherry picked from commit 16e360099d0a515d429538ec88cff1f3ede23fb4)
2024-03-26 19:04:25 +01:00
GiteaBot
0500d926b2
[skip ci] Updated licenses and gitignores
...
(cherry picked from commit a4a766f4a205d507d157f2f17a0e761e00939cb8)
2024-03-26 19:04:25 +01:00
0ko
8c4445ad3a
[I18N] Add missing translation for more_items
...
- Resolves https://codeberg.org/forgejo/forgejo/issues/2818
- Removes entry for test ignorelist
2024-03-26 22:39:46 +05:00
Codeberg Translate
cd28684ac3
[I18N] Translations update from Weblate ( #2727 )
...
Translations update from [Weblate](https://translate.codeberg.org ) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/ ).
Current translation status:
Co-authored-by: Fjuro <Fjuro@users.noreply.translate.codeberg.org>
Co-authored-by: fnetX <otto@codeberg.org>
Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org>
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: ormai <ormai@users.noreply.translate.codeberg.org>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: kita <kita@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: Salif Mehmed <mail@salif.eu>
Co-authored-by: Maytham Alsudany <maytha8thedev@gmail.com>
Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2727
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 17:28:11 +00:00
Gusted
0f79122053
[BUG] Detect protected branch on branch rename
...
- If a branch cannot be renamed due to a protected branch rule, show
this error in the UI instead of throwing an internal server error.
- Add integration test (also simplify the existing one).
- Resolves #2751
2024-03-26 15:58:52 +01:00
Mai-Lapyst
2b6546adc9
Add setting to restrict count of lines being displayed & only highlight those lines
2024-03-25 16:05:01 +01:00
Mai-Lapyst
d6428f92ce
Fix typo in language files
2024-03-25 14:33:30 +01:00
Earl Warren
9397bfd276
Merge pull request 'Offer to remove WIP: prefix in sidebar' ( #2660 ) from 0ko/forgejo:convert-to-normal into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2660
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-25 10:30:11 +00:00
Gusted
efc79dd41e
Fix typo in translation
...
Regression of 4c1af0d9a6
2024-03-24 21:30:08 +00:00
0ko
d4f48dfc4a
[I18N] Improve localization of repo summary
...
Co-authored-by: Gusted <gusted@noreply.codeberg.org>
2024-03-24 14:09:04 +05:00
Earl Warren
5a18b74632
Merge pull request '[TESTS] fail when log.Error is called' ( #2657 ) from oliverpool/forgejo:fail_test_on_log_error into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2657
2024-03-24 07:28:31 +00:00
oliverpool
a0d1cfdf7d
fix missing admin.config.allow_dots_in_usernames translation
2024-03-24 07:12:30 +01:00
Earl Warren
0bfd4ca532
Merge pull request 'Allow users to hide all "Add more units..." hints' ( #2533 ) from algernon/forgejo:less-is-more into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2533
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-24 05:42:37 +00:00
Earl Warren
33ede09135
Merge pull request '[PORT] Unify search boxes (gitea#29530)' ( #2688 ) from snematoda/port-29530 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2688
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-24 05:33:13 +00:00
wxiaoguang
44221a3cd7
Customizable "Open with" applications for repository clone ( #29320 )
...
Users could customize the "clone" menu with their own application URLs on the admin panel.
Replace #22378
Close #21121
Close #22149
2024-03-23 11:58:54 +01:00
0ko
debeedfe42
Add plural support for PR subtitles
2024-03-22 07:11:24 +01:00
Codeberg Translate
489805c322
[I18N] Translations update from Weblate ( #2710 )
...
Translations update from [Weblate](https://translate.codeberg.org ) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/ ).
Current translation status:
Co-authored-by: Fjuro <Fjuro@users.noreply.translate.codeberg.org>
Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org>
Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org>
Co-authored-by: be4zad <be4zad@users.noreply.translate.codeberg.org>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Mumulhl <mumulhl@duck.com>
Co-authored-by: ormai <ormai@users.noreply.translate.codeberg.org>
Co-authored-by: yeziruo <yeziruo@users.noreply.translate.codeberg.org>
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2710
Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org>
Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>
2024-03-22 06:02:26 +00:00
Gergely Nagy
36147f580c
Allow users to hide all "Add more units..." hints
...
Repositories displaying an "Add more..." tab on the header is a neat way
to let people discover they can enable more units. However, displaying
it all the time for repository owners, even when they deliberately do
not want to enable more units gets noisy very fast.
As such, this patch introduces a new setting which lets people disable
this hint under the appearance settings.
Fixes #2378 .
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-03-21 08:15:51 +01:00
Denys Konovalov
847f03b6a6
Unify search boxes ( #29530 )
...
Unify all but a few search boxes to use uniform style, uniform
translations and shared templates where possible.
Remove a few duplicated search templates, e. g. code search.
<details><summary>Example after screenshots:</summary>
</details>
Also includes #29700
Co-authored-by: 6543 <6543@obermui.de>
---------
Co-authored-by: 6543 <m.huber@kithara.com>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
Conflicts:
routers/web/repo/search.go
templates/repo/home.tmpl
templates/repo/search.tmpl
templates/shared/repo_search.tmpl
2024-03-20 12:31:05 +00:00
Earl Warren
6d340bcfea
Merge pull request 'Update look of repo/org tabs on homepage' ( #2593 ) from 0ko/forgejo:hometab into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2593
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-20 11:45:17 +00:00
Earl Warren
84f33ead4e
Merge pull request '[BUG] Reflect Cargo index state in settings' ( #2698 ) from gusted/forgejo-cargo-index into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2698
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-20 11:38:26 +00:00
Gusted
b06110715c
Merge pull request 'Accessibility: Label Stars/Forks links in repo explore' ( #2634 ) from fnetx/explore-label into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2634
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-20 08:20:32 +00:00
Gusted
461f925554
[BUG] Reflect Cargo index state in settings
...
- Currently in the Cargo section of the packages setting menu two
buttons are always shown, "Initalize index" and "Rebuild index", however
only of these should be shown depending on the state of the index, if
there's no index the "Initalize index" button should be shown and if
there's an index the "Rebuild index" button should be shown. This patch
does exactly that.
- Resolves #2628
2024-03-20 09:17:49 +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:
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
Otto Richter
9e69ef9c51
Label stars/forks link in repo explore
2024-03-19 23:38:08 +01: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
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
0ko
708f4bc3b6
Fix heatmap localization
...
Fixes #2552
2024-03-19 14:37:03 +05:00
