summaryrefslogtreecommitdiffstats
path: root/routers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Add setting to disable user features when user login type is not plain (#29615)Jack Hay2024-04-074-12/+14
| | | | | | | | | | | | | | | | | - Adds setting `EXTERNAL_USER_DISABLE_FEATURES` to disable any supported user features when login type is not plain - In general, this is necessary for SSO implementations to avoid inconsistencies between the external account management and the linked account - Adds helper functions to encourage correct use (cherry picked from commit 59d4aadba5c15d02f3b9f0e61abb7476870c20a5) Conflicts: - docs/content/administration/config-cheat-sheet.en-us.md Removed. - modules/setting/admin.go Trivial resolution: pick the newly added struct member.
* Add API for `Variables` (#29520)sillyguodong2024-04-078-62/+893
| | | | | | | | | | | | | | | | | 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.
* Merge pull request 'Fix "view file" button in diff compare view' (#3046) ↵Gusted2024-04-061-1/+1
|\ | | | | | | | | | | | | | | from Mai-Lapyst/forgejo:fix-diffcompare-viewfile-url into forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3046 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Reviewed-by: Gusted <gusted@noreply.codeberg.org>
| * Fix view file button in diff compareMai-Lapyst2024-04-051-1/+1
| |
* | Merge pull request 'Add optional pronoun field in user settings' (#1518) ↵Gusted2024-04-064-0/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | 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>
| * | Enable user pronoun editing from the admin uiGergely Nagy2024-04-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | add some commentshazycora2024-04-031-0/+1
| | |
| * | gofumpthazycora2024-04-031-3/+1
| | |
| * | change "any/all" to "any pronouns"hazycora2024-04-031-1/+1
| | |
| * | use recognisedPronouns variablehazycora2024-04-031-2/+7
| | |
| * | add any/all pronoun option to dropdownhazycora2024-04-031-2/+2
| | |
| * | Add "Unspecified" option to pronouns dropdownhazycora2024-04-031-2/+2
| | |
| * | use dropdown for pronoun inputhazycora2024-04-031-0/+2
| | |
| * | add pronoun field to user profileshazycora2024-04-033-0/+3
| | |
* | | Merge pull request 'feat: extend webfinger to respond to profile page URIs' ↵Gusted2024-04-061-0/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | (#2883) from realaravinth/forgejo:cb-2870 into forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2883 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
| * | | fix: cleanup webfinger URI parsingAravinth Manivannan2024-04-041-2/+1
| | | |
| * | | feat: parse for all ForgeFed actorsAravinth Manivannan2024-04-041-32/+33
| | | |
| * | | feat: improve URI parsing in webfinger endpointAravinth Manivannan2024-04-041-4/+48
| | | |
| * | | feat: extend webfinger to respond to profile page URIsAravinth Manivannan2024-04-041-0/+13
| |/ /
* | | Merge pull request 'Fix #3030 add Cache-Control header for health-check' ↵Earl Warren2024-04-061-21/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | (#3060) from adaaa/forgejo:cache-control-healthz into forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3060 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
| * | | Add health-check testAda2024-04-061-21/+21
| | | |
| * | | Remove old proxy backwards compatibilityAda2024-04-051-1/+1
| | | |
| * | | Fix #3030 add Cache-Control header for health-checkAda2024-04-051-0/+1
| | |/ | |/|
* | | feat: improve nuget nuspec apiMichael Kriese2024-04-051-40/+46
| | |
* | | Merge pull request '[FEAT] sourcehut webhooks' (#3022) from ↵Earl Warren2024-04-051-12/+12
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 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>
| * | [REFACTOR] webhook shared code to prevent import cyclesoliverpool2024-04-041-12/+12
| |/
* / add label filters in org/{org_name}/issuesiminfinity2024-04-042-0/+65
|/
* Merge pull request 'Port archived labels visual filter' (#2887) from ↵Earl Warren2024-04-031-7/+5
|\ | | | | | | | | | | | | 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>
| * [GITEA] Apply changes to archived labels0ko2024-04-011-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a squashed result of conflict resolution for the following commits from Gitea: - https://github.com/go-gitea/gitea/commit/36de5b299bb3e6e6cf28062c832ab8165e83f91a - https://github.com/go-gitea/gitea/commit/9a93b1816e0bc65101e7ad7ca66786fb38a8e628 - https://github.com/go-gitea/gitea/commit/712e19fa6fbf2f1a5b0a471782d38a7d91e538ae - https://github.com/go-gitea/gitea/commit/83850cc4799285d766d0fb5751fff10a6e4d3353 It is lacking CSS rule for archived labels, though. Changes in this commit are authored by: - 6543 - delvh - silverwind
* | Merge pull request '[BUG] Use correct template for commitmail error' (#2973) ↵Earl Warren2024-04-021-1/+1
|\ \ | | | | | | | | | | | | | | | | | | from gusted/forgejo-fix-committmail into forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2973 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
| * | [BUG] Use correct template for commitmail errorGusted2024-04-021-1/+1
| | | | | | | | | | | | | | | | | | - Use the correct template that was given when there's an error in retrieving which git identity should be used. - Remove the error from the exception list.
* | | fix: respond with JSON Resource Descriptor Content-Type per RFC7033Aravinth Manivannan2024-04-021-0/+1
|/ /
* | Merge pull request '[FEAT] Configure if protected branch rule should apply ↵Earl Warren2024-04-013-8/+14
|\ \ | | | | | | | | | | | | | | | | | | 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>
| * | [FEAT] Configure if protected branch rule should apply to adminsGusted2024-03-293-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Currently protected branch rules do not apply to admins, however in some cases (like in the case of Forgejo project) you might also want to apply these rules to admins to avoid accidental merges. - Add new option to configure this on a per-rule basis. - Adds integration tests. - Resolves #65
* | | Merge pull request 'Highlight signed tags like signed commits' (#2534) from ↵Earl Warren2024-04-011-0/+43
|\ \ \ | |_|/ |/| | | | | | | | | | | algernon/forgejo:message-in-a-bottle-ctrl-w-tag into forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2534
| * | Highlight signed tags like signed commitsGergely Nagy2024-03-301-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | [TESTS] pull review deleted from gitea#29888oliverpool2024-03-311-0/+27
| | | | | | | | | | | | Instead of db.TruncateBeans(db.DefaultContext, &issues_model.Review{}), reviews are deleted using issue.DeleteReview
* | | [REFACTOR] use Icon from interface in webhook listoliverpool2024-03-303-0/+8
| | |
* | | [REFACTOR] add Icon to webhook.Interfaceoliverpool2024-03-301-1/+5
|/ /
* | Prevent re-review and dismiss review actions on closed and merged PRs (#30065)Kemal Zebari2024-03-303-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | Add default board to new projects, remove uncategorized pseudo-board (#29874)Denys Konovalov2024-03-303-132/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On creation of an empty project (no template) a default board will be created instead of falling back to the uneditable pseudo-board. Every project now has to have exactly one default boards. As a consequence, you cannot unset a board as default, instead you have to set another board as default. Existing projects will be modified using a cron job, additionally this check will run every midnight by default. Deleting the default board is not allowed, you have to set another board as default to do it. Fixes #29873 Fixes #14679 along the way Fixes #29853 Co-authored-by: delvh <dev.lh@web.de> (cherry picked from commit e5160185ed65fd1c2bcb2fc7dc7e0b5514ddb299) Conflicts: options/locale/locale_en-US.ini trivial conflict because Forgejo strings do not have surrounding double quotes
* | Relax generic package filename restrictions (#30135)wxiaoguang2024-03-302-5/+89
| | | | | | | | | | | | | | | | | | | | Now, the chars `=:;()[]{}~!@#$%^ &` are possible as well Fixes #30134 --------- Co-authored-by: KN4CK3R <admin@oldschoolhack.me> (cherry picked from commit 1ad48f781eb0681561b083b49dfeff84ba51f2fe)
* | Refactor render (#30136)wxiaoguang2024-03-301-8/+7
| | | | | | | | (cherry picked from commit f1707f4562158853552d57394b8b1fea6df645b0)
* | Remove repetitive words (#30091)crazeteam2024-03-302-2/+2
| | | | | | | | | | | | | | remove repetitive words Signed-off-by: crazeteam <lilujing@outlook.com> (cherry picked from commit ecbc9cee2b69cd9707acb1e23ccbca048484c460)
* | Migrate margin and padding helpers to tailwind (#30043)silverwind2024-03-303-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will conclude the refactor of 1:1 class replacements to tailwind, except `gt-hidden`. Commands ran: ```bash perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/* perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/* perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/* perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/* perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/* perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/* ``` (cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de) Conflicts: routers/web/repo/view.go templates/base/head_navbar.tmpl templates/repo/code/recently_pushed_new_branches.tmpl templates/repo/diff/box.tmpl templates/repo/diff/compare.tmpl templates/repo/diff/conversation.tmpl templates/repo/header.tmpl templates/repo/issue/filter_list.tmpl templates/repo/issue/view_content/conversation.tmpl templates/repo/issue/view_content/sidebar.tmpl templates/repo/settings/options.tmpl templates/repo/view_file.tmpl templates/shared/user/blocked_users.tmpl templates/status/500.tmpl web_src/js/components/DashboardRepoList.vue resolved by prefering Forgejo version and applying the commands to all files
* | [Port] gitea#30014: Various code view improvementssilverwind2024-03-281-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Restore missing styles for message close icon 2. Move `code-line-button` so that it does not go off-screen on small viewports 3. Make `code-line-button` look and behave like other buttons 4. Make `code-line-button` work in blame 5. Make the active selection span the whole line, not just the code part 6. Tweak colors, make dark theme code bg darker, make line numbers same color in diff and file view. 7. Move code background to parent, fixing border radius and other problems 8. Enable code wrap in blame 9. Improve blame responsiveness 10. Remove `--color-code-sidebar-bg` in blame, now it uses same background as code 11. Rename `--color-active-line` to `--color-highlight-bg` 12. Add `--color-highlight-bg` 13. Fix button group borders on hover and border-right on last button. <img width="1343" alt="Screenshot 2024-03-23 at 22 34 13" src="https://github.com/go-gitea/gitea/assets/115237/fcbb919f-5dc3-43f0-97f6-870d6f412554"> <img width="1334" alt="Screenshot 2024-03-23 at 22 34 26" src="https://github.com/go-gitea/gitea/assets/115237/ca44c3b7-4328-4645-ba49-b0dc6a5ac06d"> <img width="1338" alt="Screenshot 2024-03-23 at 22 34 57" src="https://github.com/go-gitea/gitea/assets/115237/00eb0b5a-1ec7-4669-a94a-4602b9d1c1ac"> <img width="1337" alt="Screenshot 2024-03-23 at 22 34 42" src="https://github.com/go-gitea/gitea/assets/115237/752edc4a-064f-413c-9dff-c086187fcd85"> Fixes: https://github.com/go-gitea/gitea/issues/18074 --- Conflict resolution: Trivial. Ref: https://codeberg.org/forgejo/forgejo/issues/2776 (cherry picked from commit db01bf6cc88a8a7b5132b9306b3af1649566b10f)
* Merge pull request '[PERFORMANCE] git check-attr on bare repo if supported' ↵Earl Warren2024-03-282-30/+26
|\ | | | | | | | | | | | | (#2763) from oliverpool/forgejo:check_attr_bare into forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2763 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
| * [PERFORMANCE] git check-attr on bare repo if supportedoliverpool2024-03-282-30/+26
| |
* | Merge pull request '[PORT] Support repo code search without setting up an ↵Earl Warren2024-03-281-23/+35
|\ \ | | | | | | | | | | | | | | | | | | indexer (gitea#29998)' (#2813) from snematoda/port-git-grep into forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2813 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
| * | Support repo code search without setting up an indexer (#29998)wxiaoguang2024-03-281-14/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using git's ability, end users (especially small instance users) do not need to enable the indexer, they could also benefit from the code searching feature. Fix #29996 ![image](https://github.com/go-gitea/gitea/assets/2114189/11b7e458-88a4-480d-b4d7-72ee59406dd1) ![image](https://github.com/go-gitea/gitea/assets/2114189/0fe777d5-c95c-4288-a818-0427680805b6) --------- Co-authored-by: silverwind <me@silverwind.io>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 02:44:19 +0100