aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix ldap edit bug (#18859)Lunny Xiao2022-02-221-1/+1
|
* Fix ldap loginname (#18789) (#18804)Lunny Xiao2022-02-224-8/+25
| | | | | | | | | | | | | | | | | | | | | | | * Use email_address table to check user's email when login with email adress * Update services/auth/signin.go * Fix test * Fix test * Fix logging in with ldap username != loginname * Fix if user does not exist yet * Make more clear this is loginName * Fix formatting Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Johan Van de Wauw <johan@gisky.be> Co-authored-by: zeripath <art27@cantab.net>
* In disk_channel queues synchronously push to disk on shutdown (#18415) (#18788)zeripath2022-02-224-12/+12
| | | | | | | | | | | | Partial Backport of #18415 Instead of using an asynchronous goroutine to push to disk on shutdown just close the datachan and immediately push to the disk. Prevents messages of incompletely flushed queues. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* Fix bug for get user by email (#18834)Lunny Xiao2022-02-211-12/+2
| | | | | Backport #18833 Fix #18830
* Update go-org to 1.6.0 (#18824) (#18839)zeripath2022-02-212-9/+14
| | | | | | | | | Backport #18824 Fix #14074 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* Show fullname on issue edits and gpg/ssh signing info (#18828)Wim2022-02-204-6/+16
| | | Co-authored-by: zeripath <art27@cantab.net>
* Put buttons back in org dashboard (#18817) (#18825)Lunny Xiao2022-02-201-0/+9
| | | | | Backport #18817 Fix #18523
* Immediately Hammer if second kill is sent (#18823) (#18826)zeripath2022-02-202-2/+7
| | | | | | | | Backport #18823 Currently Gitea will wait for HammerTime or nice shutdown if kill -1 or kill -2 is sent. We should just immediately hammer if there is a second kill. Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix panic in EscapeReader (#18820) (#18821)zeripath2022-02-192-0/+10
| | | | | | | | Backport #18820 There is a potential panic due to a mistaken resetting of the length parameter when multibyte characters go over a read boundary. Signed-off-by: Andrew Thornton <art27@cantab.net>
* remove redundant call to UpdateRepoStats during migration (#18591) (#18794)singuliere2022-02-172-36/+4
| | | | | | | | | | | | | | | | | | | | | | | There is no need to call UpdateRepoStats in the InsertIssues and InsertPullRequests function. They are only called during migration by the CreateIssues and CreateReviews methods of the gitea uploader. The UpdateRepoStats function will be called by the Finish method of the gitea uploader after all reviews and issues are inserted. Calling it before is therefore redundant and the associated SQL requests are not cheap. The statistics tests done after inserting an issue or a pull request are also removed. They predate the implementation of UpdateRepoStats, back when the calculation of the statistics was an integral part of the migration function. The UpdateRepoStats is now tested independantly and these tests are no longer necessary. Signed-off-by: singuliere <singuliere@autistici.org> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
* Allow mermaid render error to wrap (#18791)silverwind2022-02-171-1/+1
|
* Attempt to fix the webauthn migration again - part 3 (#18770) (#18771)zeripath2022-02-1610-253/+190
| | | | | | | | | | Backport #18770 v208.go is seriously broken as it misses an ID() check. We need to no-op and remigrate all of the u2f keys. See #18756 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix template bug of LFS lock (#18784) (#18787)Lunny Xiao2022-02-162-1/+2
| | | | | | Backport #18784 Fix #18782
* Various Mermaid improvements (#18776) (#18780)silverwind2022-02-169-50/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Various Mermaid improvments - Render into iframe for improved security - Use built-in dark theme instead of color inversion - Remove flexbox attributes, resulting in more consistent size rendering - Update API usage and update to latest version * restart ci * misc tweaks * remove unneccesary declaration * make it work without allow-same-origin, add loading=lazy * remove loading attribute, does not seem to work * rename variable * skip roundtrip to DOM for rendering * don't guess chart height * update comment to make it clear it's intentional * tweak * replace deprecated 'scrolling' property * remove unused css file Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* Ensure git tag tests and others create test repos in tmpdir (#18447) (#18767)zeripath2022-02-158-67/+213
| | | | | | | | | | | | | | | | | | | | | | | | Backport #18447 * Ensure git tag tests and other create test repos in tmpdir There are a few places where tests appear to reuse testing repos which causes random CI failures. This PR simply changes these tests to ensure that cloning always happens into new temporary directories. Fix #18444 * Change log root for integration tests to use the REPO_TEST_DIR There is a potential race in the drone integration tests whereby test-mysql etc will start writing to log files causing make test-check fail. Fix #18077 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>
* Increase the size of the webauthn_credential credential_id field (#18739) ↵zeripath2022-02-149-2/+287
| | | | | | | | | | | | | | | | | | | | | (#18756) * Increase the size of the webauthn_credential credential_id field (#18739) Backport #18739 Unfortunately credentialIDs in u2f are 255 bytes long which with base32 encoding becomes 408 bytes. The default size of a xorm string field is only a VARCHAR(255) This problem is not apparent on SQLite because strings get mapped to TEXT there. Fix #18727 Signed-off-by: Andrew Thornton <art27@cantab.net> * Ignore the migrate if u2f_registration is not exist (#18760) Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* Prevent dangling GetAttribute calls (#18754) (#18755)zeripath2022-02-143-17/+25
| | | | | | | | | | | | | | | | * Prevent dangling GetAttribute calls It appears possible that there could be a hang due to unread data from the repo-attribute command pipes. This PR simply closes these during the defer. Signed-off-by: Andrew Thornton <art27@cantab.net> * move close into the defer Signed-off-by: Andrew Thornton <art27@cantab.net> * lets try again Signed-off-by: Andrew Thornton <art27@cantab.net>
* Send mail to issue/pr assignee/reviewer also when OnMention is set (#18707) ↵zeripath2022-02-141-2/+2
| | | | | | | | | | | | | | | | | | | (#18765) Backport #18707 Addresses #17892, where emails notifications are not sent to assignees (issue and PR) and reviewers (PR) when they have the email setting Only email on mention enabled. From the user experience perspective, when a user gets a issue/PR assigned or a PR review request, he/she would expect to be implicitly mentioned since the assignment or request is personal and targeting a single person only. Thus I see #17892 as a bug. Could we therefore mark this ticket as such? The changed code just explicitly checks for the EmailNotificationsOnMention setting beside the existing EmailNotificationsEnabled check. Too rude? @lunny mentioned a mock mail server for tests, is there something ready. How could I make use of it? See #12774 (comment) Fix #17892 Co-authored-by: flozzone <flozzone@gmail.com>
* Fix a broken link in `commits_list_small.tmpl` (#18764)wxiaoguang2022-02-141-1/+1
|
* Fix isempty detection of git repository (#18746) (#18750)Lunny Xiao2022-02-141-6/+5
| | | | | * Fix isempty detection of git repository * Fix IsEmpty check
* Prevent double encoding of branch names in delete branch (#18714) (#18738)zeripath2022-02-123-4/+4
| | | | | | | | | | | | | | | | | | | | | Backport #18714 * Prevent double encoding of branch names in delete branch There is a double encoding issue in branch template whereby the branch name ends up double encoded. Fix #18709 Signed-off-by: Andrew Thornton <art27@cantab.net> * and tag name Signed-off-by: Andrew Thornton <art27@cantab.net> * And fix #18704 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix forked repositories missed tags (#18719) (#18735)Lunny Xiao2022-02-121-1/+11
| | | | | | | | | | * Fix forked repositories missed tags * Add missed close * Use ctx Co-authored-by: 6543 <6543@obermui.de>
* Always set PullRequestWorkInProgressPrefixes in PrepareViewPullInfo (#18713) ↵zeripath2022-02-121-2/+2
| | | | | | | | | | | (#18737) Backport #18713 Move setting PullRequestWorkInProgressPrefixes to the start of PrepareViewPullInfo. Fix #18706 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix source code line highlighting (#18729) (#18740)Jimmy Praet2022-02-121-2/+5
| | | | | | | | | Backport #18729 When the issues repo unit is disabled, or an external issue tracker is used, there is no "a.ref-in-new-issue". Fixes #18721 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
* Reduce CI go module downloads, add make targets (#18708, #18475, #18443) ↵silverwind2022-02-123-61/+215
| | | | | | | | | | | | | | | | | (#18741) Backport #18708 Backport #18475 Backport #18443 The CI currently downloads all go modules in each pipeline step because go modules reside outside the project directory. Fix this by introducing a volume for the `/go` directory [1] so modules are only downloaded once per pipeline using a new `deps-backend` make target. For completeness, I also included new `deps` and `deps-frontend` targets and the frontend one is also triggered explicitly on CI where needed. [1] https://docs.drone.io/pipeline/kubernetes/examples/language/golang/#dependencies * Also backports #18475 and #18443 so that is was able to merge cleanly. Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Separate the details links of commit-statuses in headers (#18661) (#18730)zeripath2022-02-121-3/+3
| | | Backport #18661
* Fix release typo (#18728) (#18731)Lunny Xiao2022-02-111-1/+1
|
* Update object repo with the migrated repository (#18684) (#18726)wxiaoguang2022-02-111-1/+1
| | | | | | | | | | | When migrating a repository (from GitHub) using the API (**POST** `repos/migrate`), the Code Indexer is not updated. Searching in the user interface will not return any results. When migrating the same repository using **+/New Migration** in the web interface, the search index is updated and searching works as expected. Caused by the fact that object `repo` is never updated with the migrated repo so `setting.Indexer.RepoIndexerEnabled && !repo.IsEmpty` in `modules/notification/indexer/indexer.go:NotifyMigrateRepository` always evaluates to `false`. Tested with gitea:1.16.1, MariaDB:10, Breve in `Run Mode: Dev`. Co-authored-by: Hugo Hoitink <10838836+hoitih@users.noreply.github.com>
* Fix bug for version update hint (#18701) (#18705)Lunny Xiao2022-02-103-4/+6
| | | | | | * Fix bug for version update hint (#18701) * Add translation for zh-CN Co-authored-by: silverwind <me@silverwind.io>
* Prevent security failure due to bad APP_ID (#18678) (#18682)zeripath2022-02-102-3/+20
| | | | | | | | | | | | Backport #18678 WebAuthn may cause a security exception if the provided APP_ID is not allowed for the current origin. Therefore we should reattempt authentication without the appid extension. Also we should allow [u2f] as-well as [U2F] sections. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* Fix issue with docker-rootless shimming script (#18690) (#18699)zeripath2022-02-102-8/+4
| | | | | | | | | | Backport #18690 There is a problem with the current shimming script in that it will double quote the provided GITEA_APP_INI due to a mistake in the bash. Here we change this to use a bash array. Fix https://gitea.com/gitea/helm-chart/issues/287 Signed-off-by: Andrew Thornton <art27@cantab.net>
* C preprocessor colors improvement (#18671) (#18696)silverwind2022-02-102-3/+3
| | | | | | | | | | | | | | | | | | | | | | * C preprocessor colors improvement Fixes #18670 * Update web_src/less/chroma/light.less Co-authored-by: KN4CK3R <admin@oldschoolhack.me> * typo missing semi * add color for #include filenames Co-authored-by: KN4CK3R <admin@oldschoolhack.me> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Bruno Raoult <braoult@users.noreply.github.com> Co-authored-by: KN4CK3R <admin@oldschoolhack.me> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* Let return correct perm (#18675) (#18689)Gusted2022-02-091-1/+6
| | | Backport of #18675
* Restart zero worker if there is still work to do (#18658) (#18672)zeripath2022-02-082-10/+47
| | | | | | | | | | | | | | | | | * Restart zero worker if there is still work to do (#18658) Backport #18658 It is possible for the zero worker to timeout before all the work is finished. This may mean that work may take a long time to complete because a worker will only be induced on repushing. Also ensure that requested count is reset after pulls and push mirror sync requests and add some more trace logging to the queue push. Fix #18607 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update modules/queue/workerpool.go
* Backport: fix the missing i18n key for update checker (#18646) (#18665)wxiaoguang2022-02-081-0/+1
|
* No longer show the db-downgrade SQL in production (#18654)wxiaoguang2022-02-072-3/+8
|
* If rendering has failed due to a net.OpError stop rendering (#18642) (#18645)zeripath2022-02-071-0/+8
| | | | | | | | | | | | | Backport #18642 When a net.OpError occurs during rendering the underlying connection is essentially dead and therefore attempting to render further data will only cause further errors. Therefore in serverErrorInternal detect if the passed in error is an OpError and if so do not attempt any further rendering. Fix #18629 Signed-off-by: Andrew Thornton <art27@cantab.net>
* 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
|
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 06:57:54 +0000