aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* Update JS dependencies, remove eslint-plugin-github (#18317)silverwind2022-01-184-2910/+1660
| | | | | | | | - Update all JS dependencies - Add new lint rules - Regenerate SVGs - Tested Monaco and Mermaid * Remove eslint-plugin-github
* Add MirrorUpdated field to Repository API type (#18267)Peter Gardfjäll2022-01-183-1/+13
| | | | | Add the last update time to the repository api type. Close #18266
* replace satori/go.uuid with gofrs/uuid (#18311)zeripath2022-01-182-5/+10
| | | Signed-off-by: Andrew Thornton <art27@cantab.net>
* Place inline diff comment dialogs in the 4th column. (#18321)JonRB2022-01-181-1/+1
| | | | | | | | | | | | Comment dialogs for inline comments should appear in 4th column (not 3rd column), this PR changes the column that the inline review comment is associated with. This problem has occurred due to an unrecognised conflict between #17562 and #17315. Fix as zeripath suggested in #18320 Fix #18320 Co-authored-by: zeripath <art27@cantab.net>
* Use indirect comparison when showing pull requests (#18313)zeripath2022-01-183-7/+7
| | | | | | | | When generating the commits list and number of files changed for PRs and compare we should use "..." always not "..". Fix #18303 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Prevent ambiguous column error in organizations page (#18314)zeripath2022-01-181-5/+5
| | | | | | | | Explicitly set the table for the org_id column queries on the organizations pages. Fix #18229 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Correctly upload LFS files (#18316)zeripath2022-01-182-0/+2
| | | | | | | | We need to use the cached .gitattributes file for checking if a file should be stored in the lfs. Fix #18297 Signed-off-by: Andrew Thornton <art27@cantab.net>
* [skip ci] Updated translations via CrowdinGiteaBot2022-01-182-1/+21
|
* update description about vendoring in CONTRIBUTING.md (#18280)a10121127962022-01-172-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | * update description about vendoring in CONTRIBUTING.md follow #18277 Signed-off-by: a1012112796 <1012112796@qq.com> * Update CONTRIBUTING.md Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> * fix and readd test-vendor step * remove vendor from .gitattributes @silverwind * simplify go mod check Signed-off-by: a1012112796 <1012112796@qq.com> * Revert "remove vendor from .gitattributes @silverwind" This reverts commit 4789e704cb7a2c80934e4a4cd31efb161e6c8666. Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>
* Fix CheckRepoStats and reuse it during migration (#18264)Aravinth Manivannan2022-01-1710-168/+219
| | | | | | | | | | | | | | | | | | | The CheckRepoStats function missed the following counters: - label num_closed_issues & num_closed_pulls - milestone num_closed_issues & num_closed_pulls The update SQL statements for updating the repository num_closed_issues & num_closed_pulls fields were repeated in three functions (repo.CheckRepoStats, migrate.insertIssues and models.Issue.updateClosedNum) and were moved to a single helper. The UpdateRepoStats is implemented and called in the Finish migration method so that it happens immediately instead of wating for the CheckRepoStats to run. Signed-off-by: Loïc Dachary loic@dachary.org --- [source](https://lab.forgefriends.org/forgefriends/forgefriends/-/merge_requests/34)
* Minor tweak to tag list (#18295)silverwind2022-01-171-1/+5
| | | Slightly reduce the font size and padding in the tags table, it seemed a bit too big to me.
* show pull link for agit pull request also (#18235)a10121127962022-01-171-0/+38
|
* [skip ci] Updated translations via CrowdinGiteaBot2022-01-171-0/+22
|
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 04:38:36 +0000