summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog for v1.16.1 (#18614)v1.16.1Lunny Xiao2022-02-061-0/+29
| | | | | | Add changelog for v1.16.1 Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: zeripath <art27@cantab.net>
* comments on migrated issues/prs must link to the comment ID (#18637)singuliere2022-02-061-1/+1
| | | | | | | Instead of the issue ID which is not a valid anchor. Signed-off-by: singuliere <singuliere@autistici.org> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* Stop logging an error when notes are not found (#18626) (#18635)zeripath2022-02-062-0/+6
| | | | | | | | | Backport #18626 This is an unnecessary logging event. Fix #18616 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Only attempt to flush queue if the underlying worker pool is not finished ↵zeripath2022-02-063-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#18593) (#18620) * Only attempt to flush queue if the underlying worker pool is not finished (#18593) Backport #18593 There is a possible race whereby a worker pool could be cancelled but yet the underlying queue is not empty. This will lead to flush-all cycling because it cannot empty the pool. * On shutdown of Persistant Channel Queues close datachan and empty Partial Backport #18415 Although we attempt to empty the datachan in queues - due to races we are better off just closing the channel and forcibly emptying it in shutdown. Fix #18618 Signed-off-by: Andrew Thornton <art27@cantab.net> * Move zero workers warning to debug Fix #18617 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update modules/queue/manager.go Co-authored-by: Gusted <williamzijl7@hotmail.com> * Update modules/queue/manager.go Co-authored-by: Gusted <williamzijl7@hotmail.com> Co-authored-by: Gusted <williamzijl7@hotmail.com>
* Ensure that blob-excerpt links work for wiki (#18587) (#18624)zeripath2022-02-065-13/+41
| | | | | | | | | | | Backport #18587 It appears that the blob-excerpt links do not work on the wiki - likely since their introduction. This PR adds support for the wiki on these links. Signed-off-by: Andrew Thornton <art27@cantab.net>
* Attempt to prevent intermittent failure ↵zeripath2022-02-051-10/+14
| | | | | | | | | | | | | | | | | | | | TestGit/xxx/BranchProtectMerge/MergePR (#18451) (#18619) Backport #18451 One of the repeated intermittent failures we see in testing is a failure due to branches not being ready to merge. Prior to the immediate queue implementation we would attempt to flush all the queues and this would prevent the issue. However, the immediate queue is not flushable so the flushall is not successful at preventing this. This PR proposes an alternative solution - wait some time and try again up to 5 times. If this fails then there is a genuine issue and we should fail. Related #17719 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Ensure commit-statuses box is sized correctly in headers (#18538) (#18606)zeripath2022-02-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure commit-statuses box is sized correctly in headers (#18538) Backport #18538 Backport #18605 * Ensure commit-statuses box is sized correctly in headers When viewing commits as commits the commit-status box will be fixed at 30px in height due to being forced to be this size by a fomantic selector. This PR simply adds a few more selectors to force this to have height auto. Fix #18498 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> * Remove the spurious space in the .ui.right additional selector Somehow a spurious space sneaked in to #18538 this PR simply removes it. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
* Prevent merge messages from being sorted to the top of email chains (#18566) ↵zeripath2022-02-042-4/+131
| | | | | | | | | | | | | | | (#18588) Backport #18566 Gitea will currrently resend the same message-id for the closed/merged/reopened messages for issues. This will cause the merged message to leap to the top of an email chain and become out of sync. This PR adds specific suffices for these actions. Fix #18560 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix pushing to 1-x-dev docker tag (#18578) (#18579)zeripath2022-02-033-6/+133
| | | | | | | | | | | | | | | | | | | | | | | | | * Fix pushing to 1-x-dev docker tag It appears that #18551 and #18573 have a mistake in that raymond does not have an {{else}} on {{#equal}}. This PR notes that Sprig has a hasPrefix function and so we use this with another if. Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix pushing to 1-x-dev docker tag (part 2) Although we now have the manifest working, we need to create the images. Here we adjust the .drone.yml to force building of the images Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix pushing to 1-x-dev docker tag OK now we have the images building we should make sure that the main ones stays dev and the release/v* ones become *-dev-* Signed-off-by: Andrew Thornton <art27@cantab.net>
* Collaborator trust model should trust collaborators (#18539) (#18557)zeripath2022-02-035-9/+9
| | | | | | | | | | | | Backport #18539 There was an unintended regression in #17917 which leads to only repository admin commits being trusted. This PR restores the old logic. Fix #18501 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* Prevent panic on prohibited user login with oauth2 (#18562) (#18563)zeripath2022-02-031-1/+1
| | | | | | | | | | | | Backport #18562 There was an unfortunate regression in #17962 where following detection of the UserProhibitLogin error the err is cast to a pointer by mistake. This causes a panic due to an interface error. Fix #18561 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Make docker gitea/gitea:v1.16-dev etc refer to the latest build on that ↵zeripath2022-02-035-9/+10
| | | | | | | | | | | | | | | | | | | | | | branch (#18551) (#18569) Backport #18551 (Backporting this will enable this target to create 1.16-dev) One of the problems with our current docker tagging is that although we have strict version tags, latest and dev we do not have a way for docker users to track the current release branch. This PR simply suggests that we use the 1.x-dev tag for these and we build and push these. This will give users who want or need unreleased bug fixes the option of tracking the pre-release version instead of simply jumping to dev. (Also contains backport for #18573) Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: KN4CK3R <admin@oldschoolhack.me> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* Add dropdown icon to template loading dropdown (#18571)fnetX (aka fralix)2022-02-031-6/+1
|
* Detect conflicts with 3way merge (#18536) (#18537)zeripath2022-02-021-0/+13
| | | | | | | | | | | | | Backport #18536 Unforunately git apply --3way reports conflicts differently than standard patches resulting in conflicts being missed. Adjust the conflict detection code to account for this different error reporting. Fix #18514 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Update JS dependencies, fix lint (#18389) (#18540)silverwind2022-02-026-362/+392
| | | | | | | | | | - Update all JS dependencies, including a security issue in mermaid - Fix new linter errors related to value-keyword-case - Tested Mermaid and Swagger Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Add `GetUserTeams` (#18499) (#18531)zeripath2022-02-025-18/+62
| | | | | | | | | | | | | | | | | | | | | | | Backport #18499 * Correct use `UserID` in `SearchTeams` - Use `UserID` in the `SearchTeams` function, currently it was useless to pass such information. Now it does a INNER statement to `team_user` which obtains UserID -> TeamID data. - Make OrgID optional. - Resolves #18484 * Seperate searching specific user * Add condition back * Use correct struct type Co-authored-by: Gusted <williamzijl7@hotmail.com> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Fix review excerpt (#18502) (#18530)zeripath2022-02-023-14/+13
| | | | | | | | | | | | | | | | | | | | | Backport #18502 Currently the "File Changed" tab of a PR is somehow broken. This is also true for the current release 1.16.0. When you are on the "File Changed" tab, and want to look at code excerpt before or after the code changes, the layout breaks. You can test this on try.gitea.io here: https://try.gitea.io/testnotexisting/magic_enum/pulls/2/files The problem occurs for the unified view and for the split view. Kind of the same problem was there for commenting a line of code, this was fixed in #18321 and #18403. For consistency, I changed the solution of #18321, I removed the ``colspan`` and instead added a ``<td>``. The goal was to have code similarly with the split view. Also the separator line in the split view was in the wrong column, this was fixed too.* more consistent unified review comment Fix #18516 Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: confusedsushi <confused.sushi@googlemail.com>
* Fix for AvatarURL database type (#18487) (#18529)zeripath2022-02-021-1/+1
| | | | | Backport #18487 Co-authored-by: Viktor Kuzmin <kvaster@gmail.com>
* In docker rootless use $GITEA_APP_INI if provided (#18524) (#18535)zeripath2022-02-011-1/+1
| | | | | | | | | Currently when calling `gitea` from any shell in rootless docker image it won't respect my `$GITEA_APP_INI`. Which this change it will use that value when defined instead of the default value. - https://discourse.gitea.io/t/gitea-1-16-0-unable-to-find-configuration-file/4543 - https://gitea.com/gitea/helm-chart/issues/287 Co-authored-by: Michael Kriese <michael.kriese@visualon.de> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Update 1.16.0 changelog to set #17846 as breaking (#18533) (#18534)zeripath2022-02-011-1/+1
| | | | | | | | | Backport #18533 Unfortunately #17846 was determined to be breaking due to affecting ssh passthrough however, this discovery happened after the changelog was created. Update the Changelog to mark this as breaking. Signed-off-by: Andrew Thornton <art27@cantab.net>
* Use "read" value for General Access (#18496) (#18500)Gusted2022-02-011-1/+1
| | | - Backport of #18496
* Use `ImagedProvider` for gplus oauth2 provider (#18504) (#18505)Gusted2022-02-011-3/+2
| | | | | - Bacport of #18504 Co-authored-by: 6543 <6543@obermui.de>
* point to s3 endpoint directly (#18497) (#18510)techknowlogick2022-01-311-3/+3
|
* Fix OAuth Source Edit Page (#18495) (#18503)zeripath2022-01-312-0/+7
| | | | | | | | | | Backport #18495 * Fix OAuth Source Edit Page to ensure restricted and group settings are set * Also tolerate []interface in the groups Fix #18432 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Prevent NPE on partial match of compare URL and allow short SHA1 compare ↵Gusted2022-01-312-1/+21
| | | | | | | | | | | | | URLs (#18472) (#18473) * Don't panic & allow shorter sha1 (#18472) - Backport of #18472 * Improve comment Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Andrew Thornton <art27@cantab.net>
* Changelog 1.16.0 (#18468)v1.16.0zeripath2022-01-312-2/+27
| | | | | * Changelog for 1.16.0 Signed-off-by: Andrew Thornton <art27@cantab.net>
* GitLab reviews may not have the updated_at field set (#18450) (#18461)Aravinth Manivannan2022-01-303-33/+181
| | | | | | | | | | | | Fallback to created_at if that the case and to time.Now() if it is also missing. Fixes: #18434 Co-authored-by: Loïc Dachary <loic@dachary.org> Conflicts: services/migrations/gitlab.go trivial context conflict because var reviews became reviews := in 1.17
* Fix broken when no commits and default branch is not master (#18423)Lunny Xiao2022-01-281-7/+12
| | | | | | | * Fix broken when no commits and default branch is not master * Fix IsEmpty check * Improve codes
* Fix broken oauth2 authentication source edit page (#18412) (#18419)zeripath2022-01-261-0/+4
| | | | | | | | | | | | Backport #18412 It appears that there was a broken merge of the edit.tmpl page during the merge of #16594 - I am not entirely sure how this happened as the PR was correct. This PR fixes the broken template. Fix #18388 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Only view milestones from current repo (#18414) (#18417)zeripath2022-01-263-19/+3
| | | | | | | | Backport #18414 The endpoint /{username}/{reponame}/milestone/{id} is not currently restricted to the repo. This PR restricts the milestones to those within the repo. Signed-off-by: Andrew Thornton <art27@cantab.net>
* Place inline diff comment dialogs on split diff in 4th and 8th columns ↵zeripath2022-01-251-0/+2
| | | | | | | | | | (#18403) (#18404) Backport #18403 Fix #18391 Fix #18320 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix restore without topic failure (#18387) (#18400)Lunny Xiao2022-01-251-0/+3
| | | | Co-authored-by: zeripath <art27@cantab.net>
* Fix commit's time (#18375) (#18392)Gusted2022-01-252-2/+6
| | | | | - Backport of #18375
* Prevent showing webauthn error for every time visiting ↵wxiaoguang2022-01-251-4/+3
| | | | | `/user/settings/security` (#18385) (#18386) Backport #18385
* Fix partial cloning a repo (#18373) (#18377)Gusted2022-01-235-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | * Fix partial cloning a repo (#18373) - Backport from: #18373 - Backport isn't 1-1, because the frontport had a refactor in that area, which v1.16 doesn't have. * Include diff & use copy * Add partial clone test * patch * Apply suggestions from code review * globalArgs first * avoid copy but make GlobalCMDArgs append first * please linter Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: 6543 <6543@obermui.de>
* Fix mime-type detection for HTTP server (#18371)wxiaoguang2022-01-234-20/+61
|
* Backport: Disable content sniffing on `PlainTextBytes` (#18365)Gusted2022-01-231-0/+1
| | | - Backport of #18359
* Update github.com/duo-labs/webauthn (#18357) (#18364)65432022-01-222-9/+6
|
* [skip ci] Updated translations via CrowdinGiteaBot2022-01-191-56/+20
|
* Stop trimming preceding and suffixing spaces from editor filenames (#18334)v1.16.0-rc1zeripath2022-01-193-2/+3
| | | | | | | | | | | | | | * Stop trimming preceding and suffixing spaces from editor filenames In #5702 it was decided to trim preceding and suffixed spaces aswell as / from editing file filenames. This was because at this point in time the url-safety of Gitea was much poorer. We can now drop this requirement and file editing should work correctly. Fix #18176 Signed-off-by: Andrew Thornton <art27@cantab.net>
* [skip ci] Updated translations via CrowdinGiteaBot2022-01-192-10/+7
|
* Left-Align text in Unicode warning boxes (#18331)silverwind2022-01-191-2/+2
| | | | | | Wrapped text is more readable when left-aligned. Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: zeripath <art27@cantab.net>
* Only warn on bidi but still escape non-bidi (#18333)zeripath2022-01-191-1/+1
| | | | | Fix #18324 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix incorrect OAuth message (#18332)wxiaoguang2022-01-192-3/+3
| | | | | As the title, Fix #18327
* [skip ci] Updated translations via CrowdinGiteaBot2022-01-1910-49/+3661
|
* Changelog for 1.16.0-rc1 (#18309)techknowlogick2022-01-191-0/+294
| | | | | Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: 6543 <6543@obermui.de>
* Restore propagation of ErrDependenciesLeft (#18325)zeripath2022-01-193-6/+9
| | | | | | | | | | | Unfortunately #17643 prevented all propagation of ErrDependenciesLeft meaning that dependency errors that prevent closing of issues get swallowed. This PR restores propagation of the error but instead swallows the error in the places where it needs to be swallowed. Fix #18223 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix PR comments UI (#18323)wxiaoguang2022-01-197-27/+64
| | | | | Closes: * Review comment cannot be edited #17768 * Changing PR Comment Resolved State Disables Further Changes #18315
* Make the height of the editor in Review Box smaller (4 lines as GitHub) (#18319)wxiaoguang2022-01-193-11/+20
| | | And shrink the height of Dropzone.
* Fix commit links on compare page (#18310)Gusted2022-01-181-5/+6
| | | | | | | | | * Fix commit links on compare page - Use the correct repo link for each commit(the headrepo). As for compare pages were baserepo != headrepo, it wouldn't have the correct link. Co-authored-by: zeripath <art27@cantab.net>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 17:32:01 +0000