f803c5c0f4
Update Discord logo ( #29285 )
...
Fixes #27057 by changing the discord .svg file and running `make svg`.
Before:
<img width="637"
src="https://private-user-images.githubusercontent.com/85847352/267667100-1eaf5d20-b4e9-4736-bb55-7f1da04bbde7.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MDg0NzAwNDUsIm5iZiI6MTcwODQ2OTc0NSwicGF0aCI6Ii84NTg0NzM1Mi8yNjc2NjcxMDAtMWVhZjVkMjAtYjRlOS00NzM2LWJiNTUtN2YxZGEwNGJiZGU3LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDAyMjAlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwMjIwVDIyNTU0NVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTIwN2Y2ODc5N2MzZDU5NzgzODRhNDIzZWY3MDk3ODhiYmIzZDU4NWVlYmFmZjc2OTIyZjE3MWM4ZDg0ODZjNTYmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.C6jVQLFPfq4fhGV8wiY9D-P21PUNTDMkX2d2-kU17Ug ">
After:
<img width="637"
src="https://github.com/go-gitea/gitea/assets/106393991/45b197ae-e422-42f4-999e-25dc8f6b7a92 ">
(cherry picked from commit 3d3c3d9ee5e934c515370d98f1c552ca8ef10f8a)
2024-02-26 21:42:15 +01:00
1410079b98
[skip ci] Updated translations via Crowdin
...
(cherry picked from commit 69dbfbe4e52845a807302a15e8d79d183acf683b)
2024-02-26 21:42:15 +01:00
6068537f8a
Remove jQuery .map() and enable eslint rules for it ( #29272 )
...
- Use case in `repo-commit` was tested until the point where the POST
request was sent with the same payload.
- Use case in `repo-legacy` was tested completely with comment editing.
- `jquery/no-fade` was disabled as well to stay in sync with
`no-jquery/no-fade`, had no violations.
(cherry picked from commit a5c570c1e02302212a5d8f7cf7d91f24ab0578d5)
2024-02-26 21:42:15 +01:00
0d61f3decc
Remove jQuery from repo wiki creation page ( #29271 )
...
- Switched to plain JavaScript
- Tested the wiki creation form functionality and it works as before
# Demo using JavaScript without jQuery
---------
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit ade1110e8b7d94dc142a259854e2b73845eab8b9)
2024-02-26 21:42:15 +01:00
eefc4bf6f0
Do not show delete button when time tracker is disabled ( #29257 )
...
Fix #29233
The delete button of time logs won't be shown when the time tracker is disabled.
(cherry picked from commit 8c21bc0d51ab22c0d05d8ce2ea8bc80d6f893800)
2024-02-26 21:42:15 +01:00
89eca88643
Left align the input labels for the link account page ( #29255 )
...
In a previous [PR](https://github.com/go-gitea/gitea/pull/28753 ) we
moved the labels to be above the inputs. The PR ensures that the
alignment is also on both tabs of the link account page
(`/user/link_account`).
Before
<img width="1094" alt="before"
src="https://github.com/go-gitea/gitea/assets/6152817/ac1e86bd-c4d6-4e45-87d1-87bb8a736149 ">
After
<img width="1094" alt="after"
src="https://github.com/go-gitea/gitea/assets/6152817/1b5fc109-f4d2-43ee-b924-0a9e53a0e391 ">
---------
Co-authored-by: rafh <rafaelheard@gmail.com>
(cherry picked from commit e4e5d76932e9d5ba1f8c63213aefae1493012a81)
2024-02-26 21:42:15 +01:00
445c78e09f
[skip ci] Updated translations via Crowdin
...
(cherry picked from commit d9268369473965fce1464325d9f4b15ed9d38046)
2024-02-26 21:42:15 +01:00
58699d21e7
Remove jQuery from the repo migration form ( #29229 )
...
- Switched to plain JavaScript
- Tested the repo migration form functionality and it works as before
# Demo using JavaScript without jQuery
---------
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 100031f5f143a15c79ebbe1b77c86091e3b6d489)
2024-02-26 21:42:14 +01:00
fb137d1e49
Fix content size does not match error when uploading lfs file ( #29259 )
...
When we update an lfs file by API
`api/v1/repos/{owner}/{repo}/contents/{filepath}`, there will show an
error
```json
{
"message": "Put \"05904d6c7bhttp://localhost:3000/api/swagger "
}
```
The reason of this error is
https://github.com/go-gitea/gitea/blob/main/services/repository/files/update.go ,
in this file, the `file.ContentReader` been used twice. So when use
`file.ContentReader` in the second time, the `i` of this Reader has been
updated to the length of the content. it will return 0 and an `io.EOF`
error when we try to read cotent from this Reader.
(cherry picked from commit 35d5e4aea4bb02a0b4c7b38ecb2acf612151e891)
2024-02-26 21:42:14 +01:00
f796548225
Workaround to clean up old reviews on creating a new one ( #28554 )
...
close #28542
blocks #28544
---
*Sponsored by Kithara Software GmbH*
(cherry picked from commit 217d71c48a10265e08b95cc961656b921f61f9ff)
Conflicts:
tests/integration/api_pull_review_test.go
context
2024-02-26 21:42:14 +01:00
fe8c9b74cd
Merge pull request '[BUG] Fix diff patch operation in web UI' ( #2449 ) from gusted/forgejo-fix-diffpatch into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2449
Reviewed-by: Otto <otto@codeberg.org>
2024-02-26 20:27:07 +00:00
3d3196eb3c
Merge pull request '[TRANSLATION] Clarify description in deletion modal' ( #2488 ) from gusted/forgejo-clarify-translation into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2488
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-02-26 15:51:14 +00:00
8018c2c761
[TRANSLATION] Clarify description in deletion modal
...
- The value is now in the form `owner/repo` since #1473 , so update the
label to reflect this.
- Ref: #2412
2024-02-26 16:09:06 +01:00
775956cc68
Merge pull request '[BUG] Don't overwrite protected branch accidentally' ( #2473 ) from gusted/forgejo-error-duplicate into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2473
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-02-26 14:55:09 +00:00
f91702dd74
Merge pull request 'Split up `repo.Action` in `routers/web` into smaller functions.' ( #2476 ) from algernon/forgejo:refactor/routes/web/repo-action into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2476
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-02-26 14:54:35 +00:00
393f98e888
Merge pull request '[BUG] Use correct logout URL' ( #2475 ) from gusted/forgejo-logout-url into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2475
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-02-26 14:51:58 +00:00
5e1d7b3c82
Merge pull request 'Linguist support enhancements from gitea#29267 & bugfixes' ( #2487 ) from algernon/forgejo:linguist/gitea-29267 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2487
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-02-26 14:27:07 +00:00
ae0635fd61
Correctly support linguist-documentation=false
...
If a documentation file is marked with a `linguist-documentation=false`
attribute, include it in language stats.
However, make sure that we do *not* include documentation languages as
fallback.
Added a new test case to exercise the formerly buggy behaviour.
Problem discovered while reviewing @KN4CK3R's tests from gitea#29267.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-02-26 14:18:33 +01:00
ee39c58120
Convert linguist attribute handling to optional.Option
...
Based on @KN4CK3R's work in gitea#29267. This drops the custom
`LinguistBoolAttrib` type, and uses `optional.Option` instead. I added
the `isTrue()` and `isFalse()` (function-local) helpers to make the code
easier to follow, because these names convey their goal better than
`v.ValueorDefault(false)` or `!v.ValueOrDefault(true)`.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-02-26 12:52:59 +01:00
7e6fe41389
Add tests for the star/unstar & watch/unwatch UI
...
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-02-26 09:14:11 +01:00
c80406332f
Merge pull request '[CI] run frontend checks' ( #2477 ) from earl-warren/forgejo:wip-ci-frontend into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2477
2024-02-26 07:48:30 +00:00
4b859fd51f
Merge pull request 'Add API to get PR by base/head' ( #2481 ) from 6543-forks/forgejo:gitea_29242 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2481
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-02-26 07:46:22 +00:00
38e30f2a8f
Refactor routers/web/repo.Action
...
Split up `repo.Action` in `routers/web` into smaller functions.
While some of the functionality was very similar (starring / watching),
they are ultimately separate actions. Rather than collecting all of them
under a single handler (`repo.Action`), split them up into smaller,
independent functions.
This does result in a little bit of code duplication, but the
independent functions should be easier to follow and understand.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-02-26 08:29:13 +01:00
02eab930c9
routers/web: Drop an unused branch from repo.Action
...
The "desc" action has not been used since at least 2016, probably much
earlier. It's an ancient Gogs artifact - drop it.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-02-26 08:29:13 +01:00
feb189554e
Add API to get PR by base/head ( #29242 )
...
Closes https://github.com/go-gitea/gitea/issues/16289
Add a new API `/repos/{owner}/{repo}/pulls/{base}/{head}` to get a PR by
its base and head branch.
2024-02-26 03:41:42 +01:00
c2280a2009
Fix CSS linting errors
...
- Trivial auto-fix applied.
- Removed CSS that was no longer needed (either was removed or upstream
already improved the CSS).
- Used existing variables for colors.
- Fix CSS selectors to match existing ones.
2024-02-26 00:40:43 +01:00
dc825acb33
[I18N] Translations update from Weblate ( #2428 )
...
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 <contact@earl-warren.org>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: mondstern <mondstern@monocles.de>
Co-authored-by: Wuzzy <wuzzy@disroot.org>
Co-authored-by: Application-Maker <application-maker.uinwad@erine.email>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: Dirk <dirk@0x7be.de>
Co-authored-by: Squeljur <squeljur+git@gmail.com>
Co-authored-by: nebras <johndevand@tutanota.com>
Co-authored-by: Salif Mehmed <mail@salif.eu>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2428
Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org>
Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>
2024-02-25 22:50:12 +00:00
c4a92ec9da
[FRONTEND] fix javascript linting errors
2024-02-25 23:43:58 +01:00
9560492a84
[FRONTEND] move the gitea svg to web_src/svg
...
and run make svg to update the forgejo svg as well
2024-02-25 23:41:33 +01:00
1424df9b71
[FRONTEND] package-lock.json is named as forgejo
2024-02-25 23:40:54 +01:00
5d2c4706d0
[CI] run frontend checks
2024-02-25 23:08:09 +01:00
1272ac4f69
[BUG] Use correct logout URL
...
- If a `logout` event is send the user should be redirected to the
homepage, there are three mechanism that can do this. The response of
`/user/logout` and the event listener of notifications or stopwatch.
It's essentially a race for what's processed first to determine which
mechanism takes care of redirecting the user.
- Fix that the redirection mechanism of the notification and stopwatch
event listener redirects to an absolute URL.
- Ref: #2135
2024-02-25 21:25:59 +01:00
1bab4358ac
[BUG] Don't overwrite protected branch accidentally
...
- If a user tries to create another protected branching rule that
specifies a set of branches already used by another rule, do not allow
it.
- Update the translation accordingly.
- Adds integration test.
- Resolves #2455
2024-02-25 20:09:18 +01:00
f991f107da
Merge pull request 'Improve display of 404/500 error pages' ( #2466 ) from 0ko/forgejo:errorcodes into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2466
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-02-25 15:53:09 +00:00
649ca2b230
Merge pull request 'Allow instance-wide disabling of forking' ( #2445 ) from algernon/forgejo:f/disable-forks into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2445
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-02-25 15:13:15 +00:00
bc2a105cbb
Merge pull request '[FEAT] Check if commit is already present in target branch' ( #2450 ) from gusted/forgejo-agit-contain-commit into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2450
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-02-25 15:05:33 +00:00
006b2dd381
Merge pull request 'Eliminate wrapping quotes in English locale' ( #2467 ) from 0ko/forgejo:rnd-quotes into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2467
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-02-25 15:03:29 +00:00
39324ad005
Merge pull request '[REFACTOR] cli: prepareWorkPathAndCustomConf is not just for actions' ( #2463 ) from earl-warren/forgejo:wip-cli-refactor into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2463
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-02-25 14:48:47 +00:00
ef1d579c41
Merge pull request '[UI] Agit: Add AGit label to AGit-created PRs' ( #2444 ) from n0toose/agit-indicator into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2444
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-02-25 14:48:09 +00:00
490b81a8ed
Merge pull request 'Move permission check from ArtifactsDeleteView to the route' ( #2464 ) from algernon/forgejo:gitea-port/artifact-deletion/refactor into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2464
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-02-25 14:15:03 +00:00
a748ba70a8
10-year old images are gone
2024-02-25 18:13:59 +05:00
e34ead7a46
[I18N] eliminate wrapping quotes
2024-02-25 17:03:09 +05:00
0ea021c8c9
Allow instance-wide disabling of forking
...
For small, personal self-hosted instances with no user signups, the fork
button is just a noise. This patch allows disabling them like stars can
be disabled too.
Disabling forks does not only remove the buttons from the web UI, it
also disables the routes that could be used to create forks.
Fixes #2441 .
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-02-25 12:00:17 +01:00
186f1f5669
[THEME] refactor display of 404/500 error pages
2024-02-25 15:59:12 +05:00
9372bdd4a3
Move permission check from ArtifactsDeleteView to the route
...
As suggested by @Gusted in #2431 , move the permission checking from
`ArtifactsDeleteView` into the route instead, where it belongs.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-02-25 10:52:11 +01:00
8a5a7a88be
[REFACTOR] cli: prepareWorkPathAndCustomConf is not just for actions
...
Split prepareWorkPathAndCustomConf out of the actions sub-command.
In the CLI prepareWorkPathAndCustomConf is a preparation step that is
needed before running the sub-command actions in the Forgejo CLI. It
is currently specific to this sub-command but it will be useful for
other sub-commands such as F3.
2024-02-25 09:54:25 +01:00
b7ea2ea463
Merge pull request 'Fixes #2452 - Skipping SHA256 tests if unsupported' ( #2456 ) from lhinderberger/forgejo:2452-skip-sha256-if-unsupported into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2456
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-02-24 16:55:05 +00:00
c8ae3498e7
gofmt-ed modules/git/utils_test.go due to linter
2024-02-24 15:53:38 +01:00
3471adb14a
Merge pull request '[FEAT] Enable ambiguous character detection in configured contexts' ( #2427 ) from gusted/forgejo-ambigious-characters into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2427
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-02-24 12:25:31 +00:00
bc8d61d12e
Merge pull request '[FEAT] Restrict file size of blame operation' ( #2395 ) from gusted/forgejo-blame-restrict into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2395
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-02-23 23:17:02 +00:00
DC
