summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Migrations should not fail for comment reactions (#13352) (#13355)zeripath2020-10-291-1/+5
| | | | | An extension to #13444 - where we now ensure that comment reaction failures do not cause migrations failure Signed-off-by: Andrew Thornton <art27@cantab.net>
* And there is another one ... (#13350)zeripath2020-10-291-1/+5
| | | Signed-off-by: Andrew Thornton <art27@cantab.net>
* Remove obsolete change of email on profile page (#13341) (#13347)techknowlogick2020-10-295-5/+10
| | | | | | | | | | | | | | | * Remove obsolete change of email on profile page The change email on the account profile page is out-of-date and unnecessary. Changing email should be done using the account page. Fix #13336 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>
* Migration failure during reaction migration from gitea (#13344) (#13345)techknowlogick2020-10-283-4/+13
| | | | | | | | | | | | | | | | * Migrating reactions is just not that important A failure during migrating reactions should not cause failure of migration. Signed-off-by: Andrew Thornton <art27@cantab.net> * When checking issue reactions check the correct permission Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: zeripath <art27@cantab.net>
* Add deprecation notice for webhook payload's secret field (#13329)JustAnotherArchivist2020-10-281-0/+2
|
* Add migrated pulls to pull request task queue (#13331) (#13334)zeripath2020-10-272-8/+10
| | | | | | | | | | | | | | | * Add migrated pulls to pull request task queue Fix #13321 Signed-off-by: Andrew Thornton <art27@cantab.net> * Improve error reports Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Deny wrong pull (#13308) (#13326)M4RKUS-111112020-10-271-0/+6
| | | | | | | | | | | | | | | | | | * Deny wrong pull (#13308) * Deny wrong pull * Update routers/api/v1/repo/pull.go Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Markus <git+markus@obermui.de> Co-authored-by: zeripath <art27@cantab.net> * CI.restart() Co-authored-by: Markus <git+markus@obermui.de> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>
* Avatar autogeneration fixed (#13282)Paweł Bogusławski2020-10-263-8/+7
| | | | | | | | This mod fixes problem with initial avatar autogeneration and avatar autogneration after deleting previous avatar. Related: https://github.com/go-gitea/gitea/issues/13159 Fixes: 80a6b0f5bce15a641fc75f5f1ef6e42ef54424bc Author-Change-Id: IB#1105243
* Ensure topics added using the API are added to the repository (#13285) (#13302)zeripath2020-10-261-3/+30
| | | | | | | | | Partial Backport #13285 Fix #12426 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>
* Attempt to handle unready PR in tests (#13305) (#13310)zeripath2020-10-261-4/+21
| | | | | | | | Backport #13305 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Lauris BH <lauris@nix.lv>
* Fix Storage mapping (#13297) (#13307)zeripath2020-10-254-17/+29
| | | | | | | | | | | | | | | | | | | | | * Fix Storage mapping (#13297) Backport #13297 This PR fixes several bugs in setting storage * The default STORAGE_TYPE should be the provided type. * The Storage config should be passed in to NewStorage as a pointer - otherwise the Mappable interface function MapTo will not be found * There was a bug in the MapTo function. Fix #13286 Signed-off-by: Andrew Thornton <art27@cantab.net> * add missing changes from backport #13164 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* When the git ref is unable to be found return broken pr (#13218) (#13303)zeripath2020-10-251-1/+1
| | | | | | | Backport #13218 Fix #13216 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix bug isEnd detection on getIssues/getPullRequests (#13299) (#13301)Lunny Xiao2020-10-252-32/+50
|
* Store task errors following migrations and display them (#13246) (#13287)techknowlogick2020-10-248-41/+95
| | | | | | | | | | | | | | | | | | | | * Store task errors following migrations and display them When migrate tasks fail store the error in the task table and ensure that they show on the status page. Fix #13242 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update web_src/js/index.js * Hide the failed first Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: zeripath <art27@cantab.net>
* Remove PAM from auth dropdown when unavailable (#13276) (#13281)John Olheiser2020-10-233-8/+21
| | | Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Migrations: Gitea should not fail just because of no apiConfig return ↵65432020-10-231-6/+7
| | | | | | | | | | | | | | | | | (#13229) (#13273) * close #13227 * log it :+1: Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* More arc-green fixes (#13247) (#13253)silverwind2020-10-221-38/+57
| | | | | | | | | | | | - Fix various white borders - Tweak basic button style to have more contrast - Add more contrast to hover styles - Invert Matrix webhook icon May backport to 1.13. Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net>
* Fix initial commit page & binary munching problem (#13249) (#13258)zeripath2020-10-221-1/+10
| | | | | | | | | | | | | | | | | | | | | | | Backport #13249 * Fix initial commit page Unfortunately as a result of properly fixing ParsePatch the hack that used git show <initial_commit_id> to get the diff for this failed. This PR fixes this using the "super-secret" empty tree ref to make the diff against. Signed-off-by: Andrew Thornton <art27@cantab.net> * Also fix #13248 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update services/gitdiff/gitdiff.go Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: 6543 <6543@obermui.de>
* Add better error checking for inline html diff code (#13251)mrsdizzie2020-10-212-48/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix error in diff html rendering (#13191) * Fix error in diff html rendering Was missing an optional whitespace check in regex. Also noticed a rare case where diff.Type == Equal would be empty and thus get a newline attached. Fixed that too. Fixes #13177 * Update services/gitdiff/gitdiff.go Co-authored-by: zeripath <art27@cantab.net> * Update gitdiff_test.go * fmt Co-authored-by: zeripath <art27@cantab.net> * Add better error checking for inline html diff code (#13239) * Add better error checking for inline html diff code A better fix for #13191 which cleans up this code a bit and adds basic checking which should avoid writing broken HTML in future situations. * Update gitdiff_test.go * better regex Co-authored-by: zeripath <art27@cantab.net>
* Return the full rejection message and errors in flash errors (#13221) (#13237)zeripath2020-10-219-25/+128
| | | | | | | | | | | | * Return the full rejection message and errors in flash errors (#13221) Signed-off-by: Andrew Thornton <art27@cantab.net> * Update routers/repo/pull.go Co-authored-by: John Olheiser <john.olheiser@gmail.com> Co-authored-by: John Olheiser <john.olheiser@gmail.com>
* Update heatmap fixtures to restore tests (#13224) (#13225)65432020-10-203-3/+3
| | | `the hotfix day`
* Various arc-green fixes (#13214) (#13215)techknowlogick2020-10-201-45/+126
| | | | | | | | | | | - Style search dropdown - Fix radio buttons and tweak checkboxes - Add styling for error form elements - Make borders brighter and focus more apparent - Adjust comment box border color to match Fixes: https://github.com/go-gitea/gitea/pull/12491 Co-authored-by: silverwind <me@silverwind.io>
* Fix size and clickable area on file table back link (#13205) (#13207)techknowlogick2020-10-191-0/+7
| | | | | | | Fixes: https://github.com/go-gitea/gitea/issues/13038 Should backport to 1.13. Co-authored-by: silverwind <me@silverwind.io>
* Update CHANGELOG.md (#13200) (#13202)a10121127962020-10-181-1/+1
| | | | | Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net>
* When handling errors in storageHandler check underlying error (#13178) (#13193)techknowlogick2020-10-182-3/+38
| | | | | | | | | Unfortunately there was a mistake in #13164 which fails to handle os.PathError wrapping an os.ErrNotExist Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: zeripath <art27@cantab.net>
* fix a small nit (#13187)赵智超2020-10-171-1/+1
| | | Signed-off-by: a1012112796 <1012112796@qq.com>
* Fix diff skipping lines (#13155)zeripath2020-10-162-182/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix diff skipping lines Backport #13154 ParsePatch previously just skipped all lines that start with "+++ " or "--- " and makes no attempt to see these lines in context. This PR rewrites ParsePatch to pay attention to context and position within a patch, ensuring that --- and +++ are only skipped if appropriate. This PR also fixes several issues with incomplete files. Fix https://codeberg.org/Codeberg/Community/issues/308 Fix #13153 Signed-off-by: Andrew Thornton <art27@cantab.net> * Add testcase Signed-off-by: Andrew Thornton <art27@cantab.net> * fix comment * simplify error handling Signed-off-by: Andrew Thornton <art27@cantab.net> * never return io.EOF Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Update go-version v1.2.3 -> v1.2.4 (#13169) (#13172)65432020-10-166-11/+17
| | | | | Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net>
* Show outdated comments in pull request (#13148) (#13162)65432020-10-153-11/+27
| | | | | | Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Iván Valdés <iv@a.ki> Co-authored-by: zeripath <art27@cantab.net>
* Fix Italian language file parsing error (#13156)Lauris BH2020-10-151-2/+1
|
* align mysql service settings in droneMatti R2020-10-141-6/+0
|
* Add back only missing translation for Latvian language (#13144)v1.13.0-rc1Lauris BH2020-10-142-0/+7
| | | | | * Add back only missing translation for Latvian language * Backport German translations
* run mysql container with same conditions as other servicesMatti R2020-10-141-6/+0
|
* Changelog v1.13.0-RC1 (#13142)65432020-10-141-0/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Changelog v1.13.0 * reorder topics * impruve * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Goldmark ... * Add 12516 * Apply suggestions from code review * Update CHANGELOG.md * Apply suggestions from code review Co-authored-by: techknowlogick <matti@mdranta.net> * Apply suggestions from code review Co-authored-by: zeripath <art27@cantab.net> * Update CHANGELOG.md * Apply suggestions from code review Co-authored-by: 6543 <6543@obermui.de> * Securety is more importand than Breaking ... Co-authored-by: techknowlogick <matti@mdranta.net> Co-authored-by: zeripath <art27@cantab.net>
* [skip ci] Updated translations via CrowdinGiteaBot2020-10-142-21/+32
|
* Update sshd_config (#13143)Anders Eurenius Runvald2020-10-141-0/+4
| | | | | Afaik, adding these lines does nothing unless the file(s) are present. Having them in let's admins supply certs instead of relying on TOFU. Co-authored-by: zeripath <art27@cantab.net>
* [skip ci] Updated translations via CrowdinGiteaBot2020-10-144-0/+4
|
* Avatars and Repo avatars support storing in minio (#12516)Lunny Xiao2020-10-1421-477/+705
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Avatar support minio * Support repo avatar minio storage * Add missing migration * Fix bug * Fix test * Add test for minio store type on avatars and repo avatars; Add documents * Fix bug * Fix bug * Add back missed avatar link method * refactor codes * Simplify the codes * Code improvements * Fix lint * Fix test mysql * Fix test mysql * Fix test mysql * Fix settings * Fix test * fix test * Fix bug
* [skip ci] Updated translations via CrowdinGiteaBot2020-10-1410-10/+21
|
* Show original author's reviews on pull summary box (#13127)赵智超2020-10-144-2/+53
| | | | | | | follow #12039, show original author's reviews by other way. fix #11705. Signed-off-by: a1012112796 <1012112796@qq.com>
* [skip ci] Updated translations via CrowdinGiteaBot2020-10-147-3/+693
|
* Fix punctuation in trust model description (#13140)Lauris BH2020-10-141-2/+2
|
* Finally fix diff names (#13136)zeripath2020-10-143-124/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Finally fix diff names #12771 attempted to fix diff by avoiding the git diff line as it is possible to have an ambiguous line here. #12254 attempted to fix diff by assuming that names would quoted if they needed to be and if one was quoted then both would be. Both of these were wrong. I have now discovered `--src-prefix` and `--dst-prefix` which means that we can set this in such a way to force the git diff to always be unambiguous. Therefore this PR rollsback most of the changes in #12771 and uses these options to fix this. Signed-off-by: Andrew Thornton <art27@cantab.net> * Update services/gitdiff/gitdiff.go * Update services/gitdiff/gitdiff.go * Update modules/repofiles/temp_repo.go * fix test Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>
* [skip ci] Updated translations via CrowdinGiteaBot2020-10-143-0/+37
|
* Gitea 2 Gitea migration (#12657)65432020-10-1481-82/+6885
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * first draft * update gitea sdk to 9e280adb4da * adapt feat of updated sdk * releases now works * break the Reactions loop * use convertGiteaLabel * fix endless loop because paggination is not supported there !!! * rename gitea local uploader files * pagination can bite you in the ass * Version Checks * lint * docs * rename gitea sdk import to miss future conficts * go-swagger: dont scan the sdk structs * make sure gitea can shutdown gracefully * make GetPullRequests and GetIssues similar * rm useles * Add Test: started ... * ... add tests ... * Add tests and Fixing things * Workaround missing SHA * Adapt: Ensure that all migration requests are cancellable (714ab71ddc4260937b1480519d453d2dc4e77dd6) * LINT: fix misspells in test set * adapt ListMergeRequestAwardEmoji * update sdk * Return error when creating giteadownloader failed * update sdk * adapt new sdk * adopt new features * check version before err * adapt: 'migrate service type switch page' * optimize * Fix DefaultBranch * impruve * handle subPath * fix test * Fix ReviewCommentPosition * test GetReviews * add DefaultBranch int test set * rm unused * Update SDK to v0.13.0 * addopt sdk changes * found better link * format template * Update Docs * Update Gitea SDK (v0.13.1)
* [Enhancement] Allow admin to merge pr with protected file changes (#12078)赵智超2020-10-1319-174/+453
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Enhancement] Allow admin to merge pr with protected file changes As tilte, show protected message in diff page and merge box. Signed-off-by: a1012112796 <1012112796@qq.com> * remove unused ver * Update options/locale/locale_en-US.ini Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> * Add TrN * Apply suggestions from code review * fix lint * Update options/locale/locale_en-US.ini Co-authored-by: zeripath <art27@cantab.net> * Apply suggestions from code review * move pr proteced files check to TestPatch * Call TestPatch when protected branches settings changed * Apply review suggestion @CirnoT * move to service @lunny * slightly restructure routers/private/hook.go Adds a lot of comments and simplifies the logic Signed-off-by: Andrew Thornton <art27@cantab.net> * placate lint Signed-off-by: Andrew Thornton <art27@cantab.net> * skip duplicate protected files check * fix check logic * slight refactor of TestPatch Signed-off-by: Andrew Thornton <art27@cantab.net> * When checking for protected files changes in TestPatch use the temporary repository Signed-off-by: Andrew Thornton <art27@cantab.net> * fix introduced issue with hook Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove the check on PR index being greater than 0 as it unnecessary Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <matti@mdranta.net> Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* [skip ci] Updated translations via CrowdinGiteaBot2020-10-131-1/+20
|
* Move update-server-info to hooks (#12826)zeripath2020-10-142-4/+6
| | | | | Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Add API Section to Changelog (#13125)65432020-10-131-0/+4
| | | | Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Provide self-registering storage system (#12978)zeripath2020-10-1210-167/+257
| | | | | | | | | | | | | | | | | | | * Provide self-registering storage system Signed-off-by: Andrew Thornton <art27@cantab.net> * More simplification Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove old strings from setting Signed-off-by: Andrew Thornton <art27@cantab.net> * oops attachments not attachment Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>