Commit Graph

14212 Commits

Author SHA1 Message Date
Yarden Shoham 480a024491
Prevent multiple `To` recipients (#22566) (#22569)
Backport #22566

Change the mailer interface to prevent the leaking of possible hidden
email addresses when sending to multiple recipients.

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: Gusted <williamzijl7@hotmail.com>
2023-01-22 22:17:22 +01:00
Yarden Shoham ee10f39f9c
Truncate commit summary on repo files table. (#22551) (#22552)
Backport #22551
There was an unintended regression in #21124 which assumed that
.commits-list .message-wrapper would only match the commit summaries on
/{owner}/{name}/commits/*. This assumption is incorrect as the
directory/file view also uses a .commits-list wrapper.

Rather than completely restructure this page this PR simply adjusts the
styling to again use display: inline-block; for #repo-files-table
.commit-list .message-wrapper

Fix #22360
2023-01-22 22:17:19 +01:00
silverwind c0bda4f955
Mute all links in issue timeline (#22534)
Backport of https://github.com/go-gitea/gitea/pull/22533.
https://github.com/go-gitea/gitea/pull/21799 introduced a regression
where some links in the issue timeline were not muted any more. Fix it
by replacing all `class="text grey"` with `class="text grey
muted-links"` in the file.

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
2023-01-22 22:17:17 +01:00
zeripath e941b47221
When updating by rebase we need to set the environment for head repo (#22535) (#22536)
Backport #22535

The update by rebase code reuses the merge code but shortcircuits and
pushes back up to the head. However, it doesn't set the correct pushing
environment - and just uses the same environment as the base repo. This
leads to the push update failing and thence the PR becomes out-of-sync
with the head.

This PR fixes this and adjusts the trace logging elsewhere to help make
this clearer.

Fix #18802

Signed-off-by: Andrew Thornton <art27@cantab.net>

Signed-off-by: Andrew Thornton <art27@cantab.net>
2023-01-22 22:17:10 +01:00
John Olheiser 1df08aab97
chore: changelog 1.18.2 (#22530)
Signed-off-by: jolheiser <john.olheiser@gmail.com>
(cherry picked from commit 1ae2525922)
2023-01-19 22:47:01 +01:00
John Olheiser 83e3146fe9
Fix issue not auto-closing when it includes a reference to a branch (#22514) (#22521)
Backport #22514

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
(cherry picked from commit fd7ebaaa9c)
2023-01-19 22:47:01 +01:00
John Olheiser 546f1f23a0
Fix invalid issue branch reference if not specified in template (#22513) (#22520)
Backport #22513

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
(cherry picked from commit fa33271157)
2023-01-19 22:47:01 +01:00
John Olheiser 1b84e7a24d
Fix 500 error viewing pull request when fork has pull requests disabled (#22512) (#22515)
Backport #22512

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
(cherry picked from commit 63e5db5d7a)
2023-01-19 22:46:56 +01:00
John Olheiser 86857fdac3
Reliable selection of admin user (#22509) (#22511)
Backport #22509

Co-authored-by: Sybren <122987084+drsybren@users.noreply.github.com>
(cherry picked from commit e6e2c2f4a4)
2023-01-19 22:46:56 +01:00
Jason Song 4430bd6dd9
Set disable_gravatar/enable_federated_avatar when offline mode is true (#22479) (#22496)
Backport #22479.

When offline mode is true, we should set `disable_gravatar` to `true`
and `enable_federated_avatar` to `false` in system settings.

(cherry picked from commit e902b98cc2)
2023-01-19 22:46:56 +01:00
Loïc Dachary dd1486af80
Merge branch 'v1.18/forgejo-branding' into v1.18/forgejo 2023-01-17 19:35:33 +01:00
Loïc Dachary e97554a208
Merge branch 'v1.18/forgejo-i18n' into v1.18/forgejo 2023-01-17 19:35:27 +01:00
Earl Warren a15c03fd26
[BRANDING] define the forgejo webhook type
templates/swagger/v1_json.tmpl updated with `make generate-swagger`
2023-01-17 19:30:12 +01:00
Earl Warren 2e8e0ed274
[BRANDING] keep a copy of the original Gitea logo 2023-01-17 19:30:12 +01:00
Earl Warren 132ff87bb7
[BRANDING] add X-Forgejo-* headers 2023-01-17 19:30:12 +01:00
crystal 6caeabb2c4
Fix tertiary button (forgejo-dark) (#238)
- Makes the "Regenerate Secret" button on the OAuth2 application edit page more legible.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/238
Co-authored-by: crystal <crystal@noreply.codeberg.org>
Co-committed-by: crystal <crystal@noreply.codeberg.org>
2023-01-17 19:30:12 +01:00
Caesar Schinas 77eed1f99d
[BRANDING] change default database name 2023-01-17 19:30:11 +01:00
Earl Warren 562426ce2f
[BRANDING] gitea-vet does not work for forgejo
It forbids files that do not have Gitea copyright headers

Signed-off-by: Earl Warren <contact@earl-warren.org>
2023-01-17 19:30:11 +01:00
Earl Warren 3080860bba
[BRANDING] parse FORGEJO__* in the container environment
Add the FORGEJO__ prefix as equivalent to GITEA__ when interpreted by
environment-to-ini. It is used when running the Forgejo container like
so:

  docker run --name forgejo -e FORGEJO__security__INSTALL_LOCK=true \
             -d codeberg.org/forgejo/forgejo:1.18

Signed-off-by: Earl Warren <contact@earl-warren.org>
2023-01-17 19:30:11 +01:00
Loïc Dachary 3af1ef9bd2
[BRANDING] update link to installation instructions 2023-01-17 19:30:11 +01:00
Gusted 4c7a6eff4a
Replace branding in Swagger
- "Gitea" is automatically being determined in Swagger and cannot be
overridden, therefor we override it after `swagger generate spec` is run.
- Resolves https://codeberg.org/forgejo/forgejo/issues/226
2023-01-17 19:30:11 +01:00
TomZ c00ae950fd
Rename usage of Gitea in user-visible places
As the docs of codeberg refer to the strings printed by the Forgejo
ssh servers, this is user-facing and is nice to update to the new
product name.
2023-01-17 19:30:11 +01:00
Twann 0d1e13131a
fix constrast in /issues and /pulls (forgejo-dark) 2023-01-17 19:30:11 +01:00
Caesar Schinas 2e13294850
Rebrand default meta tags 2023-01-17 19:30:11 +01:00
Caesar Schinas 400ddee4ba
Add Forgejo light, dark, and auto themes 2023-01-17 19:30:11 +01:00
Loïc Dachary 5e171b1a16
container images: set APP_NAME 2023-01-17 19:30:10 +01:00
Caesar Schinas 9760e7ff17
Custom loading animation for Forgejo 2023-01-17 19:30:10 +01:00
Caesar Schinas 631318a3ef
Rebrand default config settings for new installs (#140)
Replaces `Gitea` with `Forgejo` in the default config settings for new installs.

This will not affect existing installs.

Co-authored-by: Caesar Schinas <caesar@caesarschinas.com>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/140
Co-authored-by: Caesar Schinas <caesar@noreply.codeberg.org>
Co-committed-by: Caesar Schinas <caesar@noreply.codeberg.org>
2023-01-17 19:30:10 +01:00
Caesar Schinas df6e027161
Add `forgejo` emoji 2023-01-17 19:30:10 +01:00
Caesar Schinas 35ae711054
Rebrand footer "powered by" links 2023-01-17 19:30:10 +01:00
Gusted 1f72194b85
Rebrand systemd service (#137)
- We can rebrand this quite safely, as only new installations would likely look into this file and configure the correct folders(to use forgejo instead of gitea).

Co-authored-by: Gusted <postmaster@gusted.xyz>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/137
2023-01-17 19:30:10 +01:00
Caesar Schinas 4f6c449788
feat(branding): add Forgejo logo 2023-01-17 19:30:10 +01:00
Gusted 7de61b880b
Disable `update_checker` cron tasks
- This is being disabled as it will weekly connect to a domain.
- This only affects existing installations, as new installations will
have a explicit value being written into app.ini due to https://github.com/go-gitea/gitea/pull/21655
2023-01-17 18:41:48 +01:00
fnetx 73f51d2959
[I18N] Move source locales to other folder 2023-01-17 18:40:50 +01:00
fnetx abb5c19efe
[I18N] Makefile + gitignore 2023-01-17 18:40:50 +01:00
fnetx 9901cf5c6c
[I18N] Add Locale merger script 2023-01-17 18:40:50 +01:00
fnetx 1da5ecd44c
[I18N] Rename upstream files 2023-01-17 18:40:50 +01:00
Percy Ma 908e15520a
[DOCS] LICENSE: add Forgejo Authors 2023-01-17 18:39:54 +01:00
Loïc Dachary a8ccada06f
[DOCS] RELEASE-NOTES.md 2023-01-17 18:39:54 +01:00
Loïc Dachary c92ef7de94
[WORKFLOW] issues & pr templates 2023-01-17 18:39:54 +01:00
Loïc Dachary aede22394d
[DOCS] README 2023-01-17 18:39:53 +01:00
Loïc Dachary 857a96cb08
[DOCS] CONTRIBUTING
Refs: https://codeberg.org/forgejo/forgejo/issues/8
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/153
Refs: https://codeberg.org/forgejo/forgejo/issues/123
2023-01-17 18:39:53 +01:00
Loïc Dachary d121cd0506
delete Gitea specific files that need rewriting for Forgejo
Although it would be possible to modify these files, it would create
conflicts when rebasing. Instead, this commit removes them entirely
and another commit can start from scratch, borrowing content from the
original files.

The drawback of this approach is that some content updates from Gitea
that also need updating in Forgejo will have to be copy/pasted
instead of being merged.
2023-01-17 18:39:53 +01:00
Gary Moon 14d65a2a12
Skip GitHub migration tests if the API token is undefined (#21824)
GitHub migration tests will be skipped if the secret for the GitHub API
token hasn't been set.

This change should make all tests pass (or skip in the case of this one)
for anyone running the pipeline on their own infrastructure without
further action on their part.

Resolves https://github.com/go-gitea/gitea/issues/21739

Signed-off-by: Gary Moon <gary@garymoon.net>
2023-01-17 18:38:50 +01:00
Loïc Dachary eaf3a918d0
implementation: forgejo container images 2023-01-17 18:38:50 +01:00
Loïc Dachary 8b4cf6f679
implementation: Woodpecker based CI
Refs: https://codeberg.org/forgejo/forgejo/issues/73
Refs: https://codeberg.org/forgejo/forgejo/issues/101
Refs: https://codeberg.org/woodpecker-plugins/plugin-docker-buildx/issues/51
Refs: https://codeberg.org/forgejo/forgejo/issues/117
Refs: https://codeberg.org/forgejo/forgejo/issues/25
Refs: https://codeberg.org/forgejo/forgejo/issues/154
Refs: https://codeberg.org/forgejo/forgejo/issues/180
2023-01-17 18:38:50 +01:00
Loïc Dachary b54c3a468e
implementation: publish forgejo- binaries instead of gitea-
Signed-off-by: Loïc Dachary <loic@dachary.org>
2023-01-17 18:38:49 +01:00
John Olheiser 6992e72647
chore: changelog 1.18.1 (#22471)
Signed-off-by: jolheiser <john.olheiser@gmail.com>
2023-01-17 10:40:47 -06:00
KN4CK3R 1bbf490926
Update `github.com/zeripath/zapx/v15` (#22485)
Fixes #22481

_Originally posted by @zeripath in
https://github.com/go-gitea/gitea/issues/22481#issuecomment-1385188703_
2023-01-17 14:51:24 +00:00
Yarden Shoham 45bdeac730
Fix pull request API field `closed_at` always being `null` (#22482) (#22483)
Backport #22482

Fix #22480
2023-01-17 11:41:43 +00:00