4f73382e95
Fix wrong table name ( #30557 )
...
The table name should be `oauth2_application` but `o_auth2_application`
Caused by
https://github.com/go-gitea/gitea/pull/21316/files#diff-9610efbc608a41f1f2eaff5790423f0a187906f6ff0beb23a5e8d18366cc2ccfR38
(cherry picked from commit e94864e86c43f435af7e1fc3c4831a4cc0a3e981)
Conflicts:
models/migrations/migrations.go
trivial context conflict because
Allow everyone to read or write a wiki by a repo unit setting (#30495 )
was skipped.
2024-04-28 15:39:00 +02:00
b9891088ad
Allow everyone to read or write a wiki by a repo unit setting ( #30495 )
...
Replace #6312
Help #5833
Wiki solution for #639
(cherry picked from commit 3feba9f1f44156c256a30d25ad1c25f751819c94)
Conflicts:
Trash everything, just keep the migration placeholder to ensure the Gitea
sequence is preserved. The Wiki edition is implemented differently.
2024-04-28 15:39:00 +02:00
4e6e63dca2
Fix compare api swagger ( #30648 )
...
The swagger format on #30349 is not right. This PR will fix it.
(cherry picked from commit 8924d9b2efd52132876fcd106c625a2a2db7a295)
2024-04-28 15:39:00 +02:00
f619b96228
Enable jquery-related eslint rules that have no violations ( #30632 )
...
All these have no violations, so enable them.
(cherry picked from commit 99c5683da5e5c50154dcf9c07229a455a5095058)
Conflicts:
.eslintrc.yaml
do not enable no-sizzle as Forgejo still uses it
2024-04-28 15:39:00 +02:00
12b199c5e5
Enable more `revive` linter rules ( #30608 )
...
Noteable additions:
- `redefines-builtin-id` forbid variable names that shadow go builtins
- `empty-lines` remove unnecessary empty lines that `gofumpt` does not
remove for some reason
- `superfluous-else` eliminate more superfluous `else` branches
Rules are also sorted alphabetically and I cleaned up various parts of
`.golangci.yml`.
(cherry picked from commit 74f0c84fa4245a20ce6fb87dac1faf2aeeded2a2)
Conflicts:
.golangci.yml
apply the linter recommendations to Forgejo code as well
2024-04-28 15:39:00 +02:00
31b608a1e9
Remove obsolete CSS text classes ( #30576 )
...
- `.text-thin` and `.text-italic` are not present in CSS so were doing nothing and I removed them.
- `.text.middle` was unused so I removed it.
- `.text.italic` is replaced with `tw-italic`.
- `.text.normal` had exactly one use and it wasn't even needed.
- add a `muted` class to the link to `org_profile_avatar.tmpl`.
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit aff7b7bdd285cc1fcabea774f153886e11ae9f5d)
2024-04-28 15:39:00 +02:00
02316e1e40
Hide diff stats on empty PRs ( #30629 )
...
When a PR is empty, e.g. has neither additions nor deletions, we don't
need to show this:
<img width="125" alt="Screenshot 2024-04-21 at 23 25 38"
src="https://github.com/go-gitea/gitea/assets/115237/0b987eb5-66f5-4b9b-b5aa-7e9e267e9b52 ">
(cherry picked from commit 0386a42f70d1026c50697b12378f5026a63182b9)
2024-04-28 15:39:00 +02:00
2b45aa42f5
[skip ci] Updated licenses and gitignores
...
(cherry picked from commit 31386dc2bb94346b5a1039f009021a4e2f5eb166)
2024-04-28 15:39:00 +02:00
4e2de8bdc6
fix(api): refactor branch and tag existence checks ( #30618 )
...
- Update branch existence check to also include tag existence check
- Adjust error message for branch/tag existence check
ref: https://github.com/go-gitea/gitea/pull/30349
---------
Signed-off-by: appleboy <appleboy.tw@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit 6459c50278906893f3cbc2bf3e52eff65e739b37)
2024-04-28 15:39:00 +02:00
e64e8d24ac
Fix flash on dashboard ( #30572 )
...
Fixes https://github.com/go-gitea/gitea/issues/30566 , regression from
https://github.com/go-gitea/gitea/pull/30214 .
(cherry picked from commit 1b1b8500aea0a17e999093e65b573ce54ae080ae)
Conflicts:
web_src/css/base.css
the conflict is because
https://codeberg.org/forgejo/forgejo/pulls/3350
skipped Remove fomantic menu module (gitea#30325)
and it was not ported.
2024-04-28 15:39:00 +02:00
2ec0c5e284
chore: use errors.New to replace fmt.Errorf with no parameters will much better ( #30621 )
...
use errors.New to replace fmt.Errorf with no parameters will much better
(cherry picked from commit 9de443ced2c328d9b58a5e144a765f402aab859d)
2024-04-28 15:39:00 +02:00
de9d498109
Merge pull request 'Fix issue watch button' ( #3509 ) from fnetx/fix-issue-watch into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3509
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-28 12:45:27 +00:00
641ddbbbb9
Merge pull request 'Release notes: Limit database max connections by default' ( #3500 ) from fnetx/release-notes-maxconn into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3500
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-28 11:19:22 +00:00
bc8860ce32
Move watching sub-template to sidebar folder
2024-04-28 12:56:28 +02:00
4b8f0d0972
Revert "Unify watching template"
...
This reverts commit 47ef51d51e
2024-04-28 12:48:17 +02:00
e8361b3c0e
Merge pull request 'Move settings button back to the right in repo and org header' ( #3462 ) from Beowulf/forgejo:move-repo-settings-btn-back-to-right into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3462
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-28 06:20:32 +00:00
5c76c37a50
Release notes for Limit database max connections by default
2024-04-27 22:03:25 +02:00
bfdbc2371d
Merge pull request 'RELEASE Version Link Interface customization' ( #3498 ) from mainboarder/forgejo:release-version into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3498
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-27 20:00:05 +00:00
9f5fda6a04
Merge pull request 'Split issue sidebar template into smaller files' ( #3445 ) from fnetx/split-sidebar-template into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3445
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Gergely Nagy <algernon@noreply.codeberg.org>
2024-04-27 19:18:56 +00:00
98589b487c
Merge pull request 'Update module github.com/minio/minio-go/v7 to v7.0.70' ( #3469 ) from renovate/github.com-minio-minio-go-v7-7.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3469
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-27 19:15:38 +00:00
df8b1b5dd2
RELEASE Version Link
2024-04-27 20:17:33 +02:00
cb004e9d8b
[I18N] Translations update from Weblate ( #3359 )
...
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>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org>
Co-authored-by: Salif Mehmed <mail@salif.eu>
Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com>
Co-authored-by: leana8959 <leana8959@users.noreply.translate.codeberg.org>
Co-authored-by: yeziruo <yeziruo@users.noreply.translate.codeberg.org>
Co-authored-by: SteffoSpieler <SteffoSpieler@users.noreply.translate.codeberg.org>
Co-authored-by: Mylloon <Mylloon@users.noreply.translate.codeberg.org>
Co-authored-by: lucasmz <lucasmz@users.noreply.translate.codeberg.org>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: FunctionalHacker <FunctionalHacker@users.noreply.translate.codeberg.org>
Co-authored-by: owofied <furry@users.noreply.translate.codeberg.org>
Co-authored-by: Xinayder <Xinayder@users.noreply.translate.codeberg.org>
Co-authored-by: kecrily <kecrily@users.noreply.translate.codeberg.org>
Co-authored-by: ZilloweZ <ZilloweZ@users.noreply.translate.codeberg.org>
Co-authored-by: toasterbirb <toasterbirb@users.noreply.translate.codeberg.org>
Co-authored-by: Pi-Cla <Pi-Cla@users.noreply.translate.codeberg.org>
Co-authored-by: sinsky <sinsky@users.noreply.translate.codeberg.org>
Co-authored-by: kdh8219 <kdh8219@users.noreply.translate.codeberg.org>
Co-authored-by: 747 <747@users.noreply.translate.codeberg.org>
Co-authored-by: Quitaxd <Quitaxd@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3359
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org>
Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>
2024-04-27 16:37:31 +00:00
8da64860e7
Merge pull request 'Update module gitea.com/gitea/act to v0.261.1' ( #3492 ) from renovate/gitea.com-gitea-act-0.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3492
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-04-27 11:01:59 +00:00
3db929a2be
chore(licenses): github.com/minio/sha256-simd is no longer in use
2024-04-27 10:43:27 +02:00
d90b1e2c00
fix(renovate): gitea.com/gitea/act requires dashboard approval
2024-04-27 10:31:13 +02:00
004fe91d37
Update module gitea.com/gitea/act to v0.261.1
2024-04-27 02:04:59 +00:00
5bc72998e0
I feel responsible … (Codeowners)
...
… for dealing with conflicts and future modification of this template
2024-04-27 02:22:05 +02:00
66b22c5818
Unify allow edits logic
2024-04-27 02:22:05 +02:00
6bd4925753
Split allow edits checkbox
2024-04-27 02:22:05 +02:00
a8f8667a03
Split references and actions
2024-04-27 02:22:05 +02:00
0eec8b84a1
Split issue dependencies
2024-04-27 02:22:05 +02:00
cc83b9349d
Split deadline / due date
2024-04-27 02:22:05 +02:00
27a9fd1792
Split timetracking
2024-04-27 02:22:04 +02:00
47ef51d51e
Unify watching template
2024-04-27 02:22:04 +02:00
35c967653b
Split watching
2024-04-27 02:22:04 +02:00
dfaeb4692c
Split participants
2024-04-27 02:22:04 +02:00
019d322351
Split assignees
2024-04-27 02:22:04 +02:00
3d5c1c6cef
Split milestones and projects
2024-04-27 02:22:04 +02:00
66cab785fc
Split PR-only templates
2024-04-27 02:22:04 +02:00
b406025aae
Move branch_selection to sidebar folder
2024-04-27 02:22:04 +02:00
08f5a25d3b
ldap: default domain name ( #3414 )
...
When the ldap synchronizer is look for an email address and fails at
finding one, it falls back at creating one using "localhost.local"
domain.
This new field makes this domain name configurable.
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3414
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Baptiste Daroussin <bapt@FreeBSD.org>
Co-committed-by: Baptiste Daroussin <bapt@FreeBSD.org>
2024-04-26 22:38:58 +00:00
4da76d0e5f
Merge pull request 'fix(Dockerfile.rootless): revert to default path for `app.ini`' ( #3363 ) from gmask/forgejo:fix/container-app-ini-variable into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3363
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-04-26 22:36:33 +00:00
c4db84ad0e
Merge pull request 'docs(release-notes): 7.0.1' ( #3484 ) from earl-warren/forgejo:wip-release-notes-v7.0 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3484
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: crystal <crystal@noreply.codeberg.org>
2024-04-26 22:34:25 +00:00
a5df622099
docs(release-notes): 7.0.1
2024-04-27 00:31:22 +02:00
f9628f883d
Move settings button back to the right in repo and org header
...
This will move the settings button back to the right, like known from
older versions.
For this, the overflow-menu was changed when a setting button is
available. If no settings button is available, the behavior will not
change.
Fixes #3301
2024-04-26 23:59:08 +02:00
dad16cd589
fix(Dockerfile.rootless): revert to default path for `app.ini`
...
The current path of the `$GITEA_APP_INI` configuration file makes the
forgejo application reset every time the container is restarted, unless
a specific volume for this file is created. Consider the following:
* This quirk is not documented
* All configuration data resides in `/var/lib/gitea`
* The custom configuration path defaults to `/var/lib/gitea/custom/conf`
(see `forgejo -h`)
* Containers mounting the volume `-v /foo/bar:/var/lib/gitea` already
have this file available to modify. Another volume shouldn't be
required
* Containers using named volumes can use `docker cp` to modify the file
inside the volume, if desired
For these reasons, it makes more sense to use the default path for
`$GITEA_APP_INI` rather than require users to create a dedicated volume
for the file. Revert it back to its default while maintaining backwards
compatibility (users can update by simply moving the file to the new
path).
2024-04-26 21:30:10 +02:00
d6c36ec406
Merge pull request 'Drop Gitea-specific columns from two tables' ( #3475 ) from algernon/forgejo:wiki-branch-wars-episode-iii-a-new-migration into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3475
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-26 10:21:28 +00:00
20350846fc
Merge pull request 'fix: git.ComputeHash did not write the content' ( #3466 ) from oliverpool/forgejo:fix_compute_hash into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3466
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-26 10:15:23 +00:00
c31ae1a651
fix(lfs): gogit /settings/lfs/find 500 error ( #3472 )
...
Refs: https://codeberg.org/forgejo/forgejo/pulls/3448
Refs: https://codeberg.org/forgejo/forgejo/issues/3438
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3472
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Co-authored-by: Earl Warren <contact@earl-warren.org>
Co-committed-by: Earl Warren <contact@earl-warren.org>
2024-04-26 09:22:09 +00:00
0819ed2053
Merge pull request 'Update dependency vitest to v1.5.2' ( #3468 ) from renovate/vitest-monorepo into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3468
2024-04-26 08:37:20 +00:00
Lunny Xiao
