sillyguodong
16696a42f5
Add API for Variables ( #29520 )
...
close #27801
---------
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 62b073e6f31645e446c7e8d6b5a506f61b47924e)
Conflicts:
- modules/util/util.go
Trivial resolution, only picking the newly introduced function
- routers/api/v1/swagger/options.go
Trivial resolution. We don't have UserBadges, don't pick that part.
- templates/swagger/v1_json.tmpl
Regenerated.
2024-04-07 10:57:53 +02:00
yp05327
473b90da53
Fix DEFAULT_SHOW_FULL_NAME=false has no effect in commit list and commit graph page ( #30096 )
...
Fix #20446
This PR will fix the username in:
repo home page
repo commit list page
repo commit graph page
pr commit page
Will not fix:
wiki revisions page:
ps: the author name is `FullName` by default
(cherry picked from commit 61036235966773a0af6b690b10b33ff8222df1d7)
2024-04-07 10:52:45 +02:00
Gusted
c2d0f64340
[BUG] Fix admin layout
...
- Fix the layout of admin pages, it previously was full-width and had
the alert at the incorrect place and within an container.
- Make the placement of the alert consistent with other pages, inside
`flex-container-main` and not wrapped around a container.
- We have to revert 145bebc829145bebc829Resolves #3082
2024-04-06 21:23:50 +02:00
Gusted
d8eebe7698
Merge pull request 'Add optional pronoun field in user settings' ( #1518 ) from hazy/forgejo:feat/pronoun-field into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1518
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Gergely Nagy <algernon@noreply.codeberg.org>
2024-04-06 12:23:54 +00:00
Earl Warren
8205ed9495
Merge pull request '[FEAT] sourcehut webhooks' ( #3022 ) from oliverpool/forgejo:webhook_7_sourcehut into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3022
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-04-05 19:23:54 +00:00
oliverpool
ed9dd0e62a
[FEAT] sourcehut webhooks
2024-04-05 10:20:40 +02:00
0ko
ddedcd44b7
Use people icon instead of person on profiles
2024-04-05 06:53:25 +02:00
0ko
df2a83ed20
[I18N] Provide plural support for followers/following in user profiles
2024-04-05 06:53:22 +02:00
Earl Warren
4ccb8c8b1f
Merge pull request '[FEAT] Add label filters in organization issues dashboard' ( #2944 ) from iminfinity/forgejo:add/label-filters into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2944
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-04 16:58:12 +00:00
0ko
2fff6c255d
[I18N] Provide plural support for release download count
...
Following https://codeberg.org/forgejo/forgejo/pulls/2899 and my review
See https://codeberg.org/forgejo/forgejo/pulls/3031#issuecomment-1733158 for why older strings were dropped
2024-04-04 19:16:00 +05:00
Earl Warren
5951c9b2c4
Merge pull request '[FEAT] Visual separation between types of attachments' ( #2899 ) from gusted/forgejo-attachment-divide into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2899
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-04-04 13:37:45 +00:00
iminfinity
8d13ed4a8d
add label filters in org/{org_name}/issues
2024-04-04 17:57:11 +05:30
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
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
8d086ad91c
change "any/all" to "any 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
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
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
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
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
Earl Warren
7e575603ee
Merge pull request 'Provide plural support for issue participants' ( #2695 ) from 0ko/forgejo:participants into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2695
2024-04-02 10:46:51 +00:00
Gusted
20a3597220
[FEAT] Visual separation between types of attachments
...
- Add a visual (but still semantic way) separation between Forgejo's
generated attachments and the user's uploaded ones.
- The styling was first done by `ul` element, but is moved to the
individual list items to have better control over them.
- Add tooltip explaining the attachment was generated by Forgejo.
- Remove the tooltip of the other attachments and 'simplify' them into a text.
- Resolves #2893
Co-authored-by: 0ko <0ko@noreply.codeberg.org>
2024-04-02 12:30:47 +02:00
Gusted
095d845f3c
[BUG] Use correct translation on closed milestones
...
- Uh self explanatory? Fix a typo.
- Regression of 365bb77a54https://codeberg.org/Codeberg/Community/issues/1526
2024-04-02 00:51:27 +02:00
Earl Warren
385bcca788
Merge pull request 'Data size unit localization' ( #2528 ) from 0ko/forgejo:sizelocalize into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2528
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-01 19:31:26 +00:00
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
b9a1d5c2be
Merge pull request 'Highlight signed tags like signed commits' ( #2534 ) from algernon/forgejo:message-in-a-bottle-ctrl-w-tag into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2534
2024-04-01 13:38:55 +00:00
0ko
4b09dd11ec
[GITEA] Apply changes to archived labels
...
This is a squashed result of conflict resolution for the following commits from Gitea:
- 36de5b299b9a93b1816e712e19fa6f83850cc479
2024-04-01 17:46:02 +05:00
Gusted
e96714016c
Merge pull request '[BUG] Consistent styling for Sort filter' ( #2920 ) from gusted/forgejo-filter-type into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2920
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-03-31 20:58:30 +00:00
0ko
c2d137d1f2
Rename ByteSize to ReadableSize
2024-03-31 20:17:12 +05:00
Gusted
b7d55de222
[BUG] Consistent styling for Sort filter
...
- The dropdowns that contain filters for issues and pull requests are
currently not styled with the `small` class, which causes a smaller font
size to be set. Remove it for the `Sort` filter to make it consistent
and make it _more_ readable.
- Resolves #2914
2024-03-31 16:24:03 +02:00
Earl Warren
76fca987a7
Merge pull request 'Fix New issue button position consistency' ( #2845 ) from 0ko/forgejo:issue-button-const into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2845
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-31 08:07:53 +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
Gusted
854164f40b
Merge pull request 'Fix accessibility and translatability of repo explore counters' ( #2862 ) from 0ko/forgejo:tr.repo.stars into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2862
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-30 22:14:22 +00:00
Gergely Nagy
432ff7d767
Highlight signed tags like signed commits
...
This makes signed tags show a badge in the tag list similar to signed
commits in the commit list, and a more verbose block when viewing a
single tag. Works for both GPG and SSH signed tags.
Fixes #1316 .
Work sponsored by @glts.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-03-30 20:14:42 +01:00
0ko
29cc80d849
Provide a way to translate data units
2024-03-30 21:10:47 +05:00
0ko
892fc82a20
Fix New issue button consistency
...
Fixes https://codeberg.org/forgejo/forgejo/issues/2613
Based on https://codeberg.org/forgejo/forgejo/issues/2613#issuecomment-1654709
- add new class `list-header-issues`;
- add rules that fix button position;
- use variable to keep the vertical offset constant;
- fix gap for edit button.
Co-authored-by: Gusted <gusted@noreply.codeberg.org>
2024-03-30 21:08:34 +05:00
oliverpool
69115baf41
[REFACTOR] use Icon from interface in webhook list
2024-03-30 16:00:06 +01:00
oliverpool
120fa61a0a
[REFACTOR] add Icon to webhook.Interface
2024-03-30 15:59:56 +01:00
Kemal Zebari
23676bfea7
Prevent re-review and dismiss review actions on closed and merged PRs ( #30065 )
...
Resolves #29965 .
---
Manually tested this by:
- Following the
[installation](https://docs.gitea.com/next/installation/install-with-docker#basics )
guide (but built a local Docker image instead)
- Creating 2 users, one who is the `Owner` of a newly-created repository
and the other a `Collaborator`
- Had the `Collaborator` create a PR that the `Owner` reviews
- `Collaborator` resolves conversation and `Owner` merges PR
And with this change we see that we can no longer see re-request review
button for the `Owner`:
<img width="1351" alt="Screenshot 2024-03-25 at 12 39 18 AM"
src="https://github.com/go-gitea/gitea/assets/60799661/bcd9c579-3cf7-474f-a51e-b436fe1a39a4 ">
(cherry picked from commit 242b331260925e604150346e61329097d5731e77)
2024-03-30 07:17:32 +01:00
