Gergely Nagy
6aba69ce85
Enable user pronoun editing from the admin ui
...
While users can edit their own pronouns, the admin UI enables an admin
to edit *any* user setting. As such, pronouns should be editable here,
too.
For the sake of simplicity, the input here is a simple text input field,
rather than a dropdown.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-04-03 15:18:02 -05:00
Gergely Nagy
efa9649696
services/convert/user: Convert pronouns properly
...
When converting from a `user_model.User` to `api.User` or
`api.UserSettings`, convert the `Pronouns` field too.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-04-03 15:18:01 -05:00
Gergely Nagy
66ac657159
Add Pronouns to the User and UserSettings api structs
...
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-04-03 15:17:15 -05:00
hazycora
1c551f923b
only add name attribute to pronouns input in JS, to ensure fallback works
2024-04-03 15:16:40 -05:00
hazycora
454ceb2ada
add some comments
2024-04-03 15:16:40 -05:00
hazycora
8cbacf850a
Add back ID field to pronouns migration
...
looks unnecessary, but not doing this seems to cause failed tests. Other previous migrations follow this pattern as well.
2024-04-03 15:16:38 -05:00
hazycora
75890e8f37
gofumpt
2024-04-03 15:15:53 -05:00
hazycora
8d086ad91c
change "any/all" to "any pronouns"
2024-04-03 15:15:53 -05:00
hazycora
20f96796d7
use recognisedPronouns variable
2024-04-03 15:15:53 -05:00
hazycora
204dd9e300
Add migration for pronouns
2024-04-03 15:15:53 -05:00
hazycora
bbf906eccc
fix locale function in profile settings
2024-04-03 15:12:30 -05:00
hazycora
21c8c09430
generate swagger
2024-04-03 15:12:30 -05:00
hazycora
74da95df67
move pronouns below full name in user profile settings
2024-04-03 15:12:30 -05:00
hazycora
12e00abe29
add any/all pronoun option to dropdown
2024-04-03 15:12:30 -05:00
hazycora
708327a548
set width on pronoun dropdown and custom input
2024-04-03 15:12:30 -05:00
hazycora
864a4332df
Make "Custom" pronoun option italic
2024-04-03 15:12:29 -05:00
hazycora
563e8b49e8
Add "Unspecified" option to pronouns dropdown
2024-04-03 15:12:29 -05:00
hazycora
994c6d3cde
move pronouns JS
2024-04-03 15:12:16 -05:00
hazycora
a6f068a93b
use dropdown for pronoun input
2024-04-03 15:12:15 -05:00
hazycora
f8e48e066a
add pronoun field to user profiles
2024-04-03 15:11:17 -05:00
Earl Warren
efd0f0f224
Merge pull request 'Port archived labels visual filter' ( #2887 ) from 0ko/forgejo:lable-archive-bw into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2887
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-03 20:06:39 +00:00
Earl Warren
5ff20d4583
Merge pull request 'Better color for labels/counters' ( #2935 ) from 0ko/forgejo:glorious-label-color into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2935
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-03 20:03:54 +00:00
Earl Warren
c360b630e3
Merge pull request '[FEAT] Allow non-explicit push options' ( #2984 ) from gusted/forgejo-push-options into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2984
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-04-03 19:00:16 +00:00
Earl Warren
f703a29cd4
Merge pull request 'Fix primary button background inconsistency' ( #3002 ) from 0ko/forgejo:fix2947 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3002
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-03 18:59:37 +00:00
Gusted
f5ad6d4be5
[FEAT] Allow non-explicit push options
...
- Currently the parsing of the push options require that `=` is present
in the value, however we shouldn't be that strict and assume if that's
not set the value is `true`.
- This allow for more natural commands, so become `-o force-push=true`
simply `-o force-push`.
- Add unit test.
2024-04-03 20:11:49 +02:00
oliverpool
6f807c3519
Merge pull request 'Simplify delay writer Close' ( #2994 ) from gusted/forgejo-simplify into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2994
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-04-03 17:25:55 +00:00
Earl Warren
6af253cc5d
Merge pull request '[BUG] Disable 'View at this point in history' for wikis' ( #2999 ) from gusted/forgejo-wiki-view-here into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2999
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-03 16:59:21 +00:00
Earl Warren
4aebf52129
Merge pull request 'Update module github.com/editorconfig/editorconfig-core-go/v2 to v2.6.2' ( #2987 ) from renovate/github.com-editorconfig-editorconfig-core-go-v2-2.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2987
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-03 16:56:21 +00:00
Earl Warren
f45aed66b0
Merge pull request '[THEME] Update variables' ( #2998 ) from gusted/forgejo-theme-code into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2998
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-03 16:49:06 +00:00
0ko
d44f290750
[UI] Fix primary button background inconsistency
...
Fixes https://codeberg.org/forgejo/forgejo/issues/2947
2024-04-03 19:52:36 +05:00
Gusted
8df9100994
[BUG] Disable 'View at this point in history' for wikis
...
- Don't show the 'View at this point in history' button for wikis as
wikis don't have this feature.
- Adds integration test
- Resolves https://codeberg.org/forgejo/forgejo/issues/2995
2024-04-03 16:00:36 +02:00
Clemens
8cd89bf4d3
added repoUri to federationService
...
This does not work yet. APAPI url OR host and id have to be derived from repoUri.
2024-04-03 15:39:37 +02:00
Gusted
629d9aa174
Merge pull request 'fix: set proper go directive' ( #2997 ) from viceice/forgejo:fix/set-proper-go-directive into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2997
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-04-03 13:18:26 +00:00
Gusted
eae9397fa2
[THEME] Update variables
...
- Follows a579a0f318Resolves #2964
2024-04-03 15:15:13 +02:00
Michael Kriese
99efe01a08
fix: set proper go directive
2024-04-03 14:50:34 +02:00
Gusted
6acedb973a
Simplify delay writer Close
...
Per https://codeberg.org/forgejo/forgejo/pulls/2983#issuecomment-1730756
2024-04-03 14:06:39 +02:00
Clemens
2b7a22afb3
renamed FederatedRepo to FollowingRepo
2024-04-03 12:26:33 +02:00
erik
daccaed157
Rename federatedRepo to followingRepo
2024-04-03 12:08:44 +02:00
Clemens
d240a9bc90
trim trailing semicolon
2024-04-03 10:25:40 +02:00
Clemens
5671566df6
adjust fed repo splitting
2024-04-03 09:53:19 +02:00
Earl Warren
7d35a76ebf
Merge pull request '[BUG] Make delay writer actually work' ( #2983 ) from gusted/forgejo-hook-processing into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2983
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-03 07:33:45 +00:00
Earl Warren
141e66b538
Merge pull request '[CI] backport auto-squash detection and -x' ( #2989 ) from earl-warren/forgejo:wip-backport-workaround into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2989
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-04-03 07:09:35 +00:00
Earl Warren
6c7179355e
[CI] backport auto-squash detection and -x
...
* Behaves as it should with merge & squashed pull requests
* Cherry-pick commits with -x for traceability
Refs: https://github.com/kiegroup/git-backporting/issues/113
2024-04-03 08:18:39 +02:00
Renovate Bot
8f3b2096a8
Update module github.com/editorconfig/editorconfig-core-go/v2 to v2.6.2
2024-04-03 04:08:11 +00:00
Renovate Bot
59bb7c2bf0
Update ghcr.io/visualon/renovate Docker tag to v37.278.0
2024-04-03 02:06:10 +00:00
Gusted
9320ffd2b5
[BUG] Make delay writer actually work
...
- Reading the code of this delay writer implemenation, it looks like
that it should only actually write content to the `io.Writer` if x
amount of time has passed by. However in practice it was always printing
the buffer even if the X amount of time didn't pass yet. This is in line
with what was being said in the issue that this was to help with
https://github.com/go-gitea/gitea/issues/9610 .
- This was caused by the extra `Close()` calls which in turn caused that
when the second `Close` is called (which is done in a defer already) it
would've printed the buffer anyway. So remove the extra calls to `Close()`.
- Add unit test.
2024-04-03 02:46:46 +02:00
Earl Warren
0a9f6297a3
Merge pull request 'Adjust the signed tag verification line' ( #2966 ) from algernon/forgejo:were-not-gonna-stop-until-we-reach-the-highest-top into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2966
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-02 22:02:03 +00:00
Gergely Nagy
d58143e4e1
Adjust the signed tag verification line
...
Move the signed tag verification line above the release notes, don't
disable the bottom margin, and make sure the verification line's box is
properly rounded like other boxes.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-04-02 23:02:34 +02:00
0ko
a245fb5c83
[THEME] Use better color for labels/counters
...
- improves contrast
- looks good
- improves consistency with other label-y elements
2024-04-02 17:40:34 +00:00
Michael Jerger
7a142c876e
remove federated user in case of user deletion
2024-04-02 18:36:22 +02:00
