forked from NYANDEV/forgejo
16815 commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Gusted
|
21f017454e
|
[PRIVACY] Add a DNS method to fetch new updates
- Use TXT records in order to determine the latest available version. - This addresses a valid privacy issue, as with HTTP requests the server can keep track(estimated) of how many instances are using Forgejo, with DNS that's basically not possible as the server will never receive any data, as the only ones receiving data are DNS resolvers. (cherry picked from commit 0baefb546ab96bc3c06d90feffdb14873c2c2a3a) (cherry picked from commit e8ee41880b775532e6a68bd2052ed96d369dee78) (cherry picked from commit 7eca4f3bf1faa3f063c9668d1bb354b842361007) (cherry picked from commit 6dde3992dc504f105f2285c34fa6445fa24da0b1) (cherry picked from commit fb3a37fbfc73d35e3ba8d793b6051aeddcbb0634) (cherry picked from commit 8304af1e9d94b89ee700b0d454d74d0dc5cfac64) (cherry picked from commit 0543a7d12a4bac012db8b9e683e879e6f265a9dc) (cherry picked from commit c3a22933b7ca8201c96267d360281848fb2a1c7e) (cherry picked from commit e24370769413aebe96ba6cfb230da3c2c33e39f4) (cherry picked from commit 7eb6d1bcf7a0bdae0cbbf06136854d0b29c54899) (cherry picked from commit 1d7b9535cd73bffda5defd143c25e514cc55dee8) (cherry picked from commit 05920dce67808ae346c4e9cd9a41c9942e857bc6) (cherry picked from commit f173f27d7c3bf36c54b7e715a61b2308d1b0d277) (cherry picked from commit 90e1c9340e72f08e67293647cf5f19b3e3571909) (cherry picked from commit de68610ea70b81146f6412e42d72b97aad0428ae) (cherry picked from commit 8d5757ea0459cffeb885462b7a9d1e1c630e1f16) (cherry picked from commit c7a7fff316c1a88ba9b0984114a25cecfac56bce) (cherry picked from commit 39ac8b8fc164090eacd5870bf78ea863d2add5fa) (cherry picked from commit 98892033012ccc4f4bef30e10932fa22bf12ebcd) [PRIVACY]: Adjust update checker description - Resolves #323 - Adjust the description of the update check function on the installation page to describe the privacy method instead of the HTTP method by checking gitea.io (cherry picked from commit 61eae5b105e374169fe23fbb150ce080f8f340ec) (cherry picked from commit 091def20a1180af718209f2bd520cb249b1943ae) (cherry picked from commit d5d11bf45a77cad6be2194620c4d865231cfbe67) (cherry picked from commit 71863d470739c743335931f1563e5b63cf3194eb) (cherry picked from commit 11ece4aab1ba7a154e985a6732c6839d8a688315) (cherry picked from commit afdd7e714f9e735811dc909a854cfac964e474e7) (cherry picked from commit 39170e2f1d64d79bb05940b72d7db602bcff1bce) (cherry picked from commit 4b3a52aab82e8b9f59f247983a4aa7de65c6c747) (cherry picked from commit 9d763c5fc8cd0ff7898855e1ef088edb264388d5) (cherry picked from commit 638db15482f6907fa21e27aaccf6795226ae60c0) (cherry picked from commit a52bfdd8e76466aa293855a35c6ac9e18a228e90) (cherry picked from commit dc93d00e85dfdd9c090294f5504b8d885a602c60) (cherry picked from commit 0bc4b3508c8d2e49b57d47b4c5b36a9365580a1b) (cherry picked from commit 3f760d85a45520d3340bf27efe667fc689b6b8ce) (cherry picked from commit ecc2716785036b5538c8022d1c4dd6156796acef) (cherry picked from commit 6334d5677eb3e1848ab16630a22ae59ab716a732) Conflicts: modules/updatechecker/update_checker.go UpdateRemoteVersion now has a context argument. However, in the updated code from Gitea the context comes from the HTTP request and does not actually provide any useful context. Replace that with context.Background() (cherry picked from commit ca2200767edb9c30b655b942824957577b1f6fe7) (cherry picked from commit f46feca224d388e92875a76c8d2428c2681ad0c5) (cherry picked from commit a800a66ca89c03a8e08f26f633bea8634cffe629) |
||
|
Gusted
|
a163efa6cf
|
[PRIVACY] Disable update_checker cron tasks
- This is being disabled as it will weekly connect to a domain. - This only affects existing installations, as new installations will have a explicit value being written into app.ini due to https://github.com/go-gitea/gitea/pull/21655 (cherry picked from commit cd0b8b6852563118ab8530c01a48bc612efcf58a) (cherry picked from commit 58d43867cab15a4b93fab6f4b467756e8030fb2d) (cherry picked from commit f290b91e504933be83d5b9540a195173280ab38d) (cherry picked from commit 5bd6d7555478713c91a3c00980060041ed34ba22) (cherry picked from commit e5d0abb59244809f5181dfbadfbee47531246a18) (cherry picked from commit 4b381ce77e699ce9f0f8af8ac3488bd8e3562b15) (cherry picked from commit b6a9b1390d9ee3aa70d50b1fae1346aff69cab08) (cherry picked from commit 367436287118b0fc4030ee6527d6c366db919594) (cherry picked from commit af0f606fc1f42be49dcbedd04055f0f9a0b7d3df) (cherry picked from commit 49560da6fb01cd6ee1a69840f48ed9269330c37a) (cherry picked from commit ca06e27c5b7b8b20e34935885c4ab0ca905b9157) (cherry picked from commit 163df86df5abdda11b6d337af32e0f0f3837119b) (cherry picked from commit 0391c6ae42eb364a6db1156af93304aa73c69b2d) (cherry picked from commit f282f2d42fd850c29b489d02133698e14b21f411) (cherry picked from commit 68d31cf2478626730324eaa56ad4264580b7030c) (cherry picked from commit cfd4a479e95597f315d9d75e2b7d22c8f6941ce2) (cherry picked from commit add969bdf624df9eed3047d60a1bae979e9bfd80) (cherry picked from commit c0f3f1f1e733b6df0f028a1393549adf7f8936f4) (cherry picked from commit f11dca9090a77dbd58ff980e97cff07a5b2d27b5) (cherry picked from commit 283810387ff26fbbf1ac795d56350a7bfb87b874) (cherry picked from commit 08af1f0ea882bbe3fada3e61988baa9f0d290d1a) (cherry picked from commit 1c1a6da319f9218cc05693e0b8461f3defe1d891) (cherry picked from commit c1444bae65daa29497209a0bcc0758b1af9828a0) (cherry picked from commit 6361df634bd8fda81793e35820f0a42c56e5e55a) (cherry picked from commit cc8bb3f94605858c3ff9412644d90d80150c3f23) (cherry picked from commit c7ae4411fd041dde1c73a5fdc64679317b6daef7) (cherry picked from commit f73f4eef02c41430cc6a7375fc3b73aab8b75de7) (cherry picked from commit 2122896e8529db6b6158bb9029492f8f5e12efb7) (cherry picked from commit d469c99671cf6a5a8087b1ad106a04b43f4edc85) (cherry picked from commit 41dbbd731edf52c1c78d34cba1dfd7e03029e5f7) (cherry picked from commit e8e742b4376ab2437097a94a5f541576f9da3c81) (cherry picked from commit 0fa9f87b5fbb81b9205650da918bab02c7f86916) (cherry picked from commit a92c724a563e0260425cfe8569dec893740b8c71) (cherry picked from commit 6a18d153e1f60bdac04a568eaa2d74cb2c1d5cb1) (cherry picked from commit 0dd35a13fdcf34f88b9cc554646402b1bb40da57) (cherry picked from commit 5ae0cbe0ae98c7e12666f185aa5da21160ab83e8) (cherry picked from commit 13bd3cf37bed863491f1284572fa0bfa470b8ec0) |
||
|
Gusted
|
b5ea6e85ac
|
[LINT] Add deadcode linter
- Add the experimental [deacode](https://pkg.go.dev/golang.org/x/tools/internal/cmd/deadcode) linter to Forgejo. - To deal with false positives that can happen due to build tags or with code that's currently only referenced by test code, the output of the tool is compared against a known-good output. - This commit doesn't make any attempt to remove any deadcode. (cherry picked from commit ac462279e9361070326d512fc209b6f148f27865) |
||
Earl Warren
|
5110476ee9
|
[FEAT] allow setting the update date on issues and comments
This field adds the possibility to set the update date when modifying
an issue through the API.
A 'NoAutoDate' in-memory field is added in the Issue struct.
If the update_at field is set, NoAutoDate is set to true and the
Issue's UpdatedUnix field is filled.
That information is passed down to the functions that actually updates
the database, which have been modified to not auto update dates if
requested.
A guard is added to the 'EditIssue' API call, to checks that the
udpate_at date is between the issue's creation date and the current
date (to avoid 'malicious' changes). It also limits the new feature
to project's owners and admins.
(cherry picked from commit c524d33402c76bc4cccea2806f289e08a009baae)
Add a SetIssueUpdateDate() function in services/issue.go
That function is used by some API calls to set the NoAutoDate and
UpdatedUnix fields of an Issue if an updated_at date is provided.
(cherry picked from commit f061caa6555e0c9e922ee1e73dd2e4337360e9fe)
Add an updated_at field to the API calls related to Issue's Labels.
The update date is applied to the issue's comment created to inform
about the modification of the issue's labels.
(cherry picked from commit ea36cf80f58f0ab20c565a8f5d063b90fd741f97)
Add an updated_at field to the API call for issue's attachment creation
The update date is applied to the issue's comment created to inform
about the modification of the issue's content, and is set as the
asset creation date.
(cherry picked from commit 96150971ca31b97e97e84d5f5eb95a177cc44e2e)
Checking Issue changes, with and without providing an updated_at date
Those unit tests are added:
- TestAPIEditIssueWithAutoDate
- TestAPIEditIssueWithNoAutoDate
- TestAPIAddIssueLabelsWithAutoDate
- TestAPIAddIssueLabelsWithNoAutoDate
- TestAPICreateIssueAttachmentWithAutoDate
- TestAPICreateIssueAttachmentWithNoAutoDate
(cherry picked from commit 4926a5d7a28581003545256632213bf4136b193d)
Add an updated_at field to the API call for issue's comment creation
The update date is used as the comment creation date, and is applied to
the issue as the update creation date.
(cherry picked from commit 76c8faecdc6cba48ca4fe07d1a916d1f1a4b37b4)
Add an updated_at field to the API call for issue's comment edition
The update date is used as the comment update date, and is applied to
the issue as an update date.
(cherry picked from commit cf787ad7fdb8e6273fdc35d7b5cc164b400207e9)
Add an updated_at field to the API call for comment's attachment creation
The update date is applied to the comment, and is set as the asset
creation date.
(cherry picked from commit 1e4ff424d39db7a4256cd9abf9c58b8d3e1b5c14)
Checking Comment changes, with and without providing an updated_at date
Those unit tests are added:
- TestAPICreateCommentWithAutoDate
- TestAPICreateCommentWithNoAutoDate
- TestAPIEditCommentWithAutoDate
- TestAPIEditCommentWithNoAutoDate
- TestAPICreateCommentAttachmentWithAutoDate
- TestAPICreateCommentAttachmentWithNoAutoDate
(cherry picked from commit da932152f1deb3039a399516a51c8b6757059c91)
Pettier code to set the update time of comments
Now uses sess.AllCols().NoAutoToime().SetExpr("updated_unix", ...)
XORM is smart enough to compose one single SQL UPDATE which all
columns + updated_unix.
(cherry picked from commit 1f6a42808dd739c0c2e49e6b7ae2967f120f43c2)
Issue edition: Keep the max of the milestone and issue update dates.
When editing an issue via the API, an updated_at date can be provided.
If the EditIssue call changes the issue's milestone, the milestone's
update date is to be changed accordingly, but only with a greater
value.
This ensures that a milestone's update date is the max of all issue's
update dates.
(cherry picked from commit 8f22ea182e6b49e933dc6534040160dd739ff18a)
Rewrite the 'AutoDate' tests using subtests
Also add a test to check the permissions to set a date, and a test
to check update dates on milestones.
The tests related to 'AutoDate' are:
- TestAPIEditIssueAutoDate
- TestAPIAddIssueLabelsAutoDate
- TestAPIEditIssueMilestoneAutoDate
- TestAPICreateIssueAttachmentAutoDate
- TestAPICreateCommentAutoDate
- TestAPIEditCommentWithDate
- TestAPICreateCommentAttachmentAutoDate
(cherry picked from commit 961fd13c551b3e50040acb7c914a00ead92de63f)
(cherry picked from commit d52f4eea44692ee773010cb66a69a603663947d5)
(cherry picked from commit 3540ea2a43155ca8cf5ab1a4a246babfb829db16)
Conflicts:
services/issue/issue.go
https://codeberg.org/forgejo/forgejo/pulls/1415
(cherry picked from commit 56720ade008c09122d825959171aa5346d645987)
Conflicts:
routers/api/v1/repo/issue_label.go
https://codeberg.org/forgejo/forgejo/pulls/1462
(cherry picked from commit 47c78927d6c7e7a50298fa67efad1e73723a0981)
(cherry picked from commit 2030f3b965cde401976821083c3250b404954ecc)
(cherry picked from commit f02aeb76981cd688ceaf6613f142a8a725be1437)
Conflicts:
routers/api/v1/repo/issue_attachment.go
routers/api/v1/repo/issue_comment_attachment.go
https://codeberg.org/forgejo/forgejo/pulls/1575
(cherry picked from commit d072525b35e44faf7ff87143c0e52b8ba8a625c8)
(cherry picked from commit 8424d0ab3df75ac3ffa30f42d398e22995ada5e7)
(cherry picked from commit 5cc62caec788b54afd9da5b9193ce06ee8ec562b)
(cherry picked from commit d6300d5dcd01c7ddc65d8b0f326f9c19cb53b58e)
[FEAT] allow setting the update date on issues and comments (squash) apply the 'update_at' value to the cross-ref comments (#1676)
[this is a follow-up to PR #764]
When a comment of issue A referencing issue B is added with a forced 'updated_at' date, that date has to be applied to the comment created in issue B.
-----
Comment:
While trying my 'RoundUp migration script', I found that this case was forgotten in PR #764 - my apologies...
I'll try to write a functional test, base on models/issues/issue_xref_test.go
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1676
Co-authored-by: fluzz <fluzz@freedroid.org>
Co-committed-by: fluzz <fluzz@freedroid.org>
(cherry picked from commit ac4f727f63a2dd746dd84a31ebf7f70d5b5d7c52)
|
||
|
Earl Warren
|
64fcb25de3
|
[UPGRADE] run sanity checks before the database is upgraded
https://codeberg.org/forgejo/forgejo/pulls/1543 (cherry picked from commit fbb71f464b9566ed83a3e8b713e433712ea71ece) (cherry picked from commit 650f849c84809002a7cd31008e53aff1202a0590) (cherry picked from commit 25e0d33dfefcf723dd9f260809a968fb022e8bad) (cherry picked from commit 222b70e504df3e49711d25c3ef196bc73658a6cb) (cherry picked from commit 4be04627a75422de0de74940fb14271c377c2929) |
||
|
Earl Warren
|
a0abe20b1b
|
[SEMVER] store SemVer in ForgejoSemVer after a database upgrade
https://codeberg.org/forgejo/forgejo/pulls/1543 (cherry picked from commit 6146ef6263893cc367e8504de8e80f78231d2f49) (cherry picked from commit 45b9005ad935b20b56be6c404391ff2932875035) (cherry picked from commit 4622cc5cc4764afe01a2dc6e1d56c8b73d7f70c6) (cherry picked from commit ed39cdc54cda89bf864b8e09d555751909af651d) (cherry picked from commit b837dbd434659ee5bf769dd9b30b6be062453698) |
||
|
Earl Warren
|
06a47ea56e
|
[TESTS] tests.AddFixtures helper loads additional per-test fixtures
(cherry picked from commit 93a844dd13904c0ba1b7fd4a0a233002194a504b) (cherry picked from commit 6d6d1a121ce3fc5cf7cd92ad1a38be3bdcbf7088) (cherry picked from commit 8b101f2860dfbdfd99de71d30740c9e72e1cd9d5) (cherry picked from commit 3e56212d6d1bca0aecdc1f224c7d78287ef9d35d) (cherry picked from commit 4f619bc58583892c197ee2588ead929342336217) |
||
|
Gusted
|
9fbe28fca3
|
[GITEA] Make confirmation clearer for dangerous actions
- Currently the confirmation for dangerous actions such as transferring the repository or deleting it only requires the user to ~~copy paste~~ type the repository name. - This can be problematic when the user has a fork or another repository with the same name as an organization's repository, and the confirmation doesn't make clear that it could be deleting the wrong repository. While it's mentioned in the dialog, it's better to be on the safe side and also add the owner's name to be an element that has to be typed for these dangerous actions. - Added integration tests. (cherry picked from commit bf679b24dd23c9ed586b9439e293bbd27cc89232) (cherry picked from commit 1963085dd9d1521b7a4aa8558d409bd1a9f2e1da) (cherry picked from commit fb94095d1992c3e47f03e0fccc98a90707a5271b) (cherry picked from commit e1d1e46afee6891becdb6ccd027fc66843b56db9) (cherry picked from commit 93993029e4ec8a20a8bc38d80bb4b801e52ee1b7) (cherry picked from commit df3b058179d8f3e06cc6fb335b287c72c8952821) (cherry picked from commit 8ccc6b9cba46a736665e4b25523da0baf1679702) |
||
|
Gusted
|
6d882ede35
|
[META] Add CODEOWNERS files
- As per https://codeberg.org/forgejo/discussions/issues/53#issuecomment-1070207 - Using the `CODEOWNERS` feature it should speed up the development process for contributors as for the most common PRs the right reviewers will be added by Forgejo automatically. They can be added very precisely according to the changed files of the PR. - This feature is implemented in v1.21, which means it's not available on Codeberg. (cherry picked from commit 1511ef1c803f31fcf2887611982a114465f3be60) (cherry picked from commit 99999e3a034b719dcefc63951538d917dfd9e496) (cherry picked from commit 0b0dd6f7a95ce718c8ff73e8e6fe1b660a4e3277) (cherry picked from commit d42940034f7fe1f1f706e4fff8f9b5c8465003fc) (cherry picked from commit 5be6e7d2542e6915d1df3d9f29a8504f851b8f52) (cherry picked from commit d12d6e8633a9f88c1283a3613f8dc1ffff1acacb) (cherry picked from commit d3b3e691bfad6713b92ee636ddba953b897bfbbd) (cherry picked from commit 2a13f95551b323a52ea20823760b5ecdc629233a) |
||
Caesar Schinas
|
861fb8ee61
|
[WORKFLOW] yaml issue templates
(cherry picked from commit 28c0f327cf1f67a53899f8590e9b85aacd485c39) (cherry picked from commit 1b532f16c79c52b1e03fdf1dd73723542cb70d78) (cherry picked from commit 6e35d3ffb1a28b5622194866554d3821a4c82b09) (cherry picked from commit 3e6ba3b3b7d4552f308db08a202ab568a7ece719) (cherry picked from commit d47d8dd9662a4a1e84de22ba90b41da216b13dbf) (cherry picked from commit 2716166cd4d96d870275ba04ad5811b79dca4272) (cherry picked from commit 50c67cb9062f51df8628327234cb3474f50dd93b) (cherry picked from commit ba0049afc1da6d766b0a37a3a8ca1175e2d98eb4) (cherry picked from commit 09c596b3c3f319ec82affdbfde6f2ea6f14ba4ef) (cherry picked from commit b7611172584e0cd378b4c7676b2b22908b4a1b8f) (cherry picked from commit 45c9dc8f20c27180f7d84b66d92de0a6cb8bfc77) |
||
cassiozareck
|
3198b4a642
|
[FEAT] add Forgero Git Service
Signed-off-by: cassiozareck <cassiomilczareck@gmail.com> (cherry picked from commit a878adfe628cf6dc367a17c3715fcd3499aa02b6) Adding description and Forgejo SVG (cherry picked from commit 13738c03804d019f28550e46a4ebc37dbe3a5cfc) Undo reordering and tmpl redirection (cherry picked from commit 9ae51c46f42acecac834371857e638098ebf6d27) (cherry picked from commit 70fffdc61d06dd1d70b6a31496676a23d3d0c2fc) (cherry picked from commit c0ebfa9da3db3e60d7b403a1bf8b8a19c32c5dc7) (cherry picked from commit 9922c92787eccaba0021486ba0a3eb28583969e1) (cherry picked from commit 00c0effbc74aedc7a4167a69c8a410ef324d576b) (cherry picked from commit e4c9525b137205fa9ffdb4e0d7492bbbda9be6b5) (cherry picked from commit 09d7b83211652d045975b0e3bb790856267d52a5) (cherry picked from commit bbcd5975c91f6932f7f2ee07fbd63e84560ba96a) (cherry picked from commit 55c70a0e18d33d8ac0da9ffb97f6d994ed88a319) (cherry picked from commit 76596410c0dd0137cd497c9728c3e1d1c98f2430) (cherry picked from commit 1308043931388bf6de691ad0f766861b77fb08a5) (cherry picked from commit 919d6aedfed6abc8ec9def19f8deec2ee413252b) [FEAT] add Forgero Git Service (squash) more tests Previously only Gitea service was being tested under self-hosted migrations. Since Forgejo is also self-hosted and in fact use the same downloader/migrator we can add to this suite another test that will do the same, migrating the same repository under the same local instance but for the Forgejo service (represented by 9) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1709 Co-authored-by: zareck <cassiomilczareck@gmail.com> Co-committed-by: zareck <cassiomilczareck@gmail.com> (cherry picked from commit 40a4b8f1a8637f78cf2f48104f0b336377652df9) |
||
|
Earl Warren
|
358386fab7
|
[UPGRADE] add sanity check for v1.20.5-0
See https://forgejo.org/2023-10-release-v1-20-5-0/ (cherry picked from commit 7d619f79a0ebebf0de49be6175701769db04f7c2) (cherry picked from commit ce5c75e1532894c180c66c38f828fd647c3b8174) (cherry picked from commit 7b9eddf494211c247984e01fa299d9ba4e38589e) (cherry picked from commit 200b6cdbdb1f16a193d1e22904567fc470a007c2) (cherry picked from commit 860b18393da614113b74807345369e334aa7332a) |
||
|
Earl Warren
|
e0ab67536b
|
[TESTS] upgrade tests for storage
(cherry picked from commit 884ca63738cc2e2c7cde31c649e9fa77cd590044) (cherry picked from commit 0a45d9c37b187249d347020ca79e71c523177d61) [TESTS] upgrade tests for storage (squash) relative paths (cherry picked from commit 3bb19285f365ae0b56dedc183db04504946a2a50) (cherry picked from commit c640c09e6110a8c684dfcc8f9fc05495f30c16f1) (cherry picked from commit 40ffe2d226f1ea1e78ae40eb0deeccc0838b5d48) [UPGRADE] S3 storage and fixtures (cherry picked from commit c466c9c6571b18b1426e07439e7aa6445f5d86dd) (cherry picked from commit e80abbe2cd7968c5c5601bf5e39de9b265e40ca4) (cherry picked from commit 50a47df1d17df60cda6504165d5b02ac42e63c86) [UPGRADE] add sanity checks for [storage*] (squash) speedup upgrade tests (cherry picked from commit f578279cfe85d4e23b83d3759ec782790fed869d) (cherry picked from commit 6dd677f151d3ba3b6f016d788585372958608cd6) (cherry picked from commit ee7e7eca27a2e123188cdf05fb493f51c8c8a3e4) (cherry picked from commit 879ffca697e6cd04d364ad46a6d4a2d957ba3eb3) (cherry picked from commit 60b33cc5af4f8ad4e2f27034a7cff98959f44128) (cherry picked from commit a75b450c7b45f6647ca432bce4cdaebdea70dc47) (cherry picked from commit 4e8712c52377533fada2cc747d20784275b03aa4) (cherry picked from commit f6447567a464d2320d26fcccf7fc7293dc6e2a44) |
||
|
Earl Warren
|
8c5d8bfea0
|
[UPGRADE] add sanity checks for [storage*]
Refs: https://forgejo.org/2023-08-release-v1-20-3-0/ (cherry picked from commit a266dd0ce3fca1296c6713ff1266f0065f0cd72b) (cherry picked from commit b9eb5eccd83e73ab6fb392557b7036063244f357) (cherry picked from commit 7fc2028ede6e3a576c3714b27940de9f871c33bd) (cherry picked from commit 0c988e612028eab277f03c16c0597da08c2c293a) (cherry picked from commit 7ba05e8c2b51c4c08ab3885f9014f7bdaf3d0f6b) (cherry picked from commit 2ed5068abe0cb57a257167d669faee207762b1d0) (cherry picked from commit 353913a26dd749f017cf8b76cf9218f68e8ca408) (cherry picked from commit 4e63a01a8bf9d0c8a1a6a6d7a3b18c64369bbaf1) (cherry picked from commit 99f612aed30852b23fe325bd5b6095aee9bd558e) (cherry picked from commit b4fe189caea9c656edd9c0c20e0d667911e4921c) (cherry picked from commit bd35e3b7bc2d64e649915c5103067be1c7ffbe44) (cherry picked from commit f59d9f7088af9963041eedc46fcce2ec8c9c4722) (cherry picked from commit 0b2a93e044b1d9319345ed2b6104a479eae376ef) |
||
|
Earl Warren
|
eadbbb1afe
|
[UPGRADE] run sanity checks before the database is upgraded
(cherry picked from commit 69741e4e66932a9ac092089e7ba27399c55dcd1a) (cherry picked from commit 2a3c7b09cbdfd62cca2619aaf37b6913a373d142) (cherry picked from commit a1554c1168d897e8db4024d716a837c012bf74e9) (cherry picked from commit edae2c6d2dda7f44e40ae88fba60a15f61b72232) (cherry picked from commit 49737cf009a6a0fc119cf8a1a1593493c77c841a) (cherry picked from commit ec53704c34a3e9491b4f210250d5e053f4b221e5) (cherry picked from commit 7a1c5c0f323cb5e9235d8fa6e59a0a1b172d3abb) (cherry picked from commit e658c20c0f21b42f741c0149e0e79ea0bb3b949c) (cherry picked from commit baf575468f39c5dd0c2ff3498ef9f706d12d114e) (cherry picked from commit 40cb14eff427c801243e374f7c60fef994bcb792) (cherry picked from commit 25ab4d07136d023236de00e9143957c856b4d196) (cherry picked from commit 5a29005215a5e9419ed3096c1bc0aae172f45089) (cherry picked from commit fef1260e990719af49644970aaa2a7219438b681) |
||
|
Earl Warren
|
11717b864b
|
[GITEA] add GetFile to config provider
(cherry picked from commit 88d1b53eeaa0d5ad0ed54c191236db928aadedf0) (cherry picked from commit f63f71afad2aa8272772dba919485c5e858d2fae) (cherry picked from commit 1f774145fc731e2d93cf8a6708dbf4c15722fa5e) (cherry picked from commit 53e637693bcbb9fe9daca9a296c9d2c700fc915b) (cherry picked from commit 4974cbf10a8b51d51591fa6f6281f4cd7a415c91) (cherry picked from commit 554bca7fae7fa6f0235ab631598115875711d80e) (cherry picked from commit 61b8cf83b988a2d8547b81cfb7aaeefaf2e17fba) (cherry picked from commit d8bcc6f68c6dc972e8c99eb7b46a4f096f85cd61) (cherry picked from commit ee04c340724cccada2c71db45ec510d19e92e099) (cherry picked from commit 713153a6d63205984f2a85ee07f08269df3b0a85) (cherry picked from commit 4e18c4f8bb35b02494d75311986fadb87328d477) (cherry picked from commit 32be9db12df3dea9c12bf803a5226b6ae8cd7b32) (cherry picked from commit fd50e9b9b4d7cd804e57418056126ed2df9bec6a) |
||
|
Earl Warren
|
0285c99774
|
[TESTS] verify facts for the admin storage documentation
(cherry picked from commit 57e597bf7e1e3bb3b7bcbcea66a4ea170a231f85) (cherry picked from commit 643a2b0e81570e935779f6c509ebe4633fad74b9) (cherry picked from commit f10faffb4febeef114d5be4e6abe57bd3cd72894) (cherry picked from commit b440c5767eebdf406200e9a47446827778514425) [TESTS] verify facts for the admin storage documentation (squash) (cherry picked from commit d83d8ce57b8b39b4da849f5403198ecf706117ba) (cherry picked from commit d8855ef27cd1b219184e95ce055bc6d84350ee26) (cherry picked from commit 11230466ec0c1c4db1296cdd2ead74fc91a34491) (cherry picked from commit b2cdd9d971b694fe32bab11f9ccdb41a38d7c6fe) (cherry picked from commit a0a5e785241ac2c3a7493aa62637351021d48a39) (cherry picked from commit 846413110fb936c386ba7fa80ff67e4394231464) (cherry picked from commit 72b92d5a7854f5afbd949e0c6e53f3a4f5b72055) (cherry picked from commit 7e039a9427d7a181ded17d653f49aa26679479e4) (cherry picked from commit 227d42a1b69a1e542576ddc094d038de210183bb) (cherry picked from commit 6488950a9b00b746c936fec41e6a9c59c4c02740) |
||
|
Earl Warren
|
f83f0f9feb
|
[SEMVER] store SemVer in ForgejoSemVer after a database upgrade
(cherry picked from commit b7fe7cf401f4bddd6455efc651f7ac054f3fe1cf) (cherry picked from commit cf339eed4f4851b18448dbdd83df32d00bc6f45b) (cherry picked from commit 4f3a16168bbeced519a60c32e10e2895d9367238) (cherry picked from commit 6f5bbc53fcebd614f5ee8627c7d6e3c637ffa694) (cherry picked from commit aca42b422e76668387769c15868ef77b073bb7db) (cherry picked from commit 5a7f7580e525694d1f27e12329c8532bd29273f8) (cherry picked from commit 06c383c807ad49e1e35b429a10c6a11c65aeebe5) (cherry picked from commit fe831dcb53b81b6cc632be751bfcbfb9bc00efd3) (cherry picked from commit cd12cd0dbce47c6117ea579ae5019c182155b3a9) (cherry picked from commit cc79163703ce31706c86b88c38fb8a20ed745e20) (cherry picked from commit 0102a5715ea6a03b560cc2f0b6cbe2b2576c255e) (cherry picked from commit 403f7520b3056eace36eae505afbab6a05f597b7) (cherry picked from commit a3b61510a246f61c174ddc3c288e556522a6aab9) |
||
|
Gusted
|
00c6940851
|
[DB] forgejo migration v1: add blocked user migration
(cherry picked from commit 66afddd511d2821f648919925ea365cd085e4e77) (cherry picked from commit 19da0dee9df87cb946d1c8e25b917f7283d95302) (cherry picked from commit 0b725af693828bd7705b09433fb25d974fbb820e) (cherry picked from commit 64d4de2b664a9f406b2927c6e6b465ee2b3a8915) (cherry picked from commit 05bc9d3b7f8d00a37b41615f9caccca84a98c0ee) (cherry picked from commit 5958553066d275c767018454fbed9470c2cf473d) (cherry picked from commit c4f77e26c913eb3293bc702e1c65e2d09757cfe1) (cherry picked from commit 3034832c6637965bf70c766d9169ca3c28c27cd3) (cherry picked from commit d48931ec5b677989f8b2ef91752b2e3ef25ff2a2) (cherry picked from commit b1e0d53c28369666367e2629b4226338a111e0e2) (cherry picked from commit e3de35fe15c33d87f1a33e193fa7e038c5e3a724) (cherry picked from commit 3b2712c3d6bd0884166787e8c257305d54247112) |
||
|
Earl Warren
|
d641cdeaf0
|
[DB] forgejo migration v2: create the forgejo_sem_ver table
(cherry picked from commit 86b26436af85e0eedb732e115e8be024e1d54ca6) (cherry picked from commit 479cba59aca2b3b73a83e5acc0b754906230f0b2) (cherry picked from commit 4765f9a889ce7324416b51e7d4524b2368459752) (cherry picked from commit af771410bfaa511bbc97cbfeefbb279b3836158d) (cherry picked from commit d1ea9305d8d653d637cbde6d383c095bdc4991f0) (cherry picked from commit f77e1bb7abd6054851b811fc0d71bf0130085353) (cherry picked from commit 0b95f8fe899ce14e19e5aeccd3e53e21b8bf8fc1) (cherry picked from commit 4f8fb2390a415d2f9319c9f23ff653c31efd2409) (cherry picked from commit 8ea0e22ff6e09f1e46d9a10f1325f7c6997c018b) (cherry picked from commit 43ac19ac59044210906c96857194231ca7804c92) (cherry picked from commit 0d2f63df4f9579c62ed21c807c53e689b1c71dbb) (cherry picked from commit d02a8036fda2bfcf8791366198e25735547d6b3f) (cherry picked from commit 1fe4c7db941b892df38be12249d4898248ff016e) |
||
|
Earl Warren
|
3add683c94
|
[DB] run all Forgejo migrations in integration tests
The tests at tests/integration/migration-test/migration_test.go will not run any Forgejo migration when using the gitea-*.sql.gz files because they do not contain a ForgejoVersion row which is interpreted as a new Forgejo installation for which there is no need for migration. Create a situation by which the ForgejoVersion table exists and has a version of 0 in tests/integration/migration-test/forgejo-v1.19.0.*.sql.gz thus ensuring all Forgejo migrations are run. The forgejo*.sql.gz files do not have any Gitea related records, which will be interpreted by the Gitea migrations as a new installation that does not need any migration. As a consequence the migration tests run when using forgejo-v1.19.0.*.sql.gz are exclusively about Forgejo migrations. (cherry picked from commit ec8003859c920ac05a071ad9b1d9d8af5a694ac0) (cherry picked from commit 697570ff390656930d41bcdc4194aacc5c7a54f4) (cherry picked from commit f041aec17265ca34943f961d9640e60c96c0f24d) (cherry picked from commit 60463e3bab9dfa6aae7f379fc77309ab52b1d250) (cherry picked from commit b2fc2a7c1338ad2a9bd0a6887443e604dccda53f) (cherry picked from commit fb2759b6afc213d5e2db8f6e523391927c611b23) (cherry picked from commit 37cfc3b2275afd523f53e149781d69a2914fd83b) (cherry picked from commit 832607500a576a40ee1e35897e58ef319dba9788) (cherry picked from commit 143d4007b1b60ad1880b64ce1d4998e77854a05a) (cherry picked from commit a17e803fbfb7908729c2d92fd58360806cce6fbe) (cherry picked from commit 72ffd49bc3c218acf8c87f7464f2c028860adba8) (cherry picked from commit 9b92a5fd725b34d7ed18b5f1ebc78e1a45de07eb) (cherry picked from commit 0a334d0a9b02617360aaa76d55dbb0f6fd5547f4) |
||
Gusted
|
d20e325378
|
[DB] Forgejo database migrations
- Implements https://codeberg.org/forgejo/discussions/issues/32#issuecomment-918737
- Allows to add Forgejo-specific migrations that don't interfere with Gitea's migration logic. Please do note that we cannot liberally add migrations for Gitea tables, as they might do their own migrations in a future version on that table, and that could undo our migrations. Luckily, we don't have a scenario where that's needed and thus not taken into account.
Co-authored-by: Gusted <postmaster@gusted.xyz>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/795
(cherry picked from commit 8ee32978c0af1f8f71679c87f695df2b90b617c8)
(cherry picked from commit
|
||
Panagiotis "Ivory" Vasilopoulos
|
1beab7af46
|
[FEAT] Use OpenStreetMap in USER_LOCATION_MAP_URL by default
Follow-up to
|
||
|
Gusted
|
cd841848ee
|
[META] Use correct language for .tmpl
- Upstream chosen `Handlebars` as language for the templates, presumenly because Github doesn't have an syntax highlighter for Go. - Forgejo does have syntax highlighting support for Go templates, so use that. (cherry picked from commit a79718522dc432e32cf322498ddf22ec570fa8fd) (cherry picked from commit 380d847e5cdb179292c7bd1a5e3e6839fb8b31dd) (cherry picked from commit 4126a9672d93fc33b72fb816a404056aac64dfc8) (cherry picked from commit afde0ed82271df540348953a811a8e9db1a83343) (cherry picked from commit 6ddaca00615340958e1aecca2c4807e39a2b1eff) (cherry picked from commit 454b2f6b35c018cc631dd8847ae9d3243d9adc37) (cherry picked from commit 58c10e1f93da8d8f193936eff00ebd86ecd8b78c) (cherry picked from commit 19ec0a5536204105be78744b436a35710d8e8702) (cherry picked from commit c3717ae4deb8acb43f861675dc44f689def544ed) (cherry picked from commit 6c74bbe5757b290c2fe5ea13cd980a2b11fb207e) (cherry picked from commit 9cb48db780c3592a6aa1df2770a309729eca35f6) (cherry picked from commit 19cb774553302a7ece9d653d052b6de4c47de687) (cherry picked from commit ac35eb83cd6f34da6079ec4ba8d00390aa56a0c0) (cherry picked from commit 986a306d221b14891d1e5776ad3088d5636595cb) |
||
|
Earl Warren
|
2d75f86f0e
|
[SEMVER] 6.0.0+0-gitea-1.21.0
(cherry picked from commit 4107d99f25a9eee1eab2b52cdd579c69523366da) (cherry picked from commit 7e097b945c0dab444485c68d4a583b9dcef6952c) (cherry picked from commit 431edaac36e263c4b99cdab076bc402ed1ee4819) (cherry picked from commit 51ecd89e31f8e4b1fa50422f26e5c01a1961b9a3) (cherry picked from commit 734d7f5bc7326479d5389a71c2f1bbcc1c03c41a) (cherry picked from commit f34e88d00cc1077cef3611f8c49406851bdd6d7e) (cherry picked from commit cd882a75f95bc0612b5f429efd066922db3def73) (cherry picked from commit 7dfa28db3f8c1d61ecd22e5b52b479c62a6d1ae5) (cherry picked from commit 4bdaeeb68679e30e1f578fcee418f0c2fb7445f8) (cherry picked from commit a0e8285914e99312fa6eab657e91e70d05e766f7) (cherry picked from commit 72991a99f3010b59981133013983b7424605aec4) (cherry picked from commit c99949bbf7768b6572e414e42ba40c0a110cf82e) (cherry picked from commit d4dd7df8e7cadd0c3ac7214c0bb1245b4cb965dd) (cherry picked from commit 1fe5c1e81e611fa30b39d8fce564bac12d6de880) (cherry picked from commit 969b727c508e3498feefaac7fad4a5deafab6861) (cherry picked from commit f2061a87c0a798acb00f464debba6ea149d7d8bf) |
||
|
Earl Warren
|
d2b544847f
|
[TESTS] increase test-sqlite log level to Trace
It does not pollute the output because they go to sqlite-log/gitea.log and it may provide clues for debugging. When trying to figure out a problem in production, Debug is likely to be used but in a development environment a very fine grain log is the most useful. If that's really too much noise, the lines can be trimmed by removing all those with [T]. (cherry picked from commit 666b02eb9d6e50b3a8d3ec5659fa6fb8451d0d9f) (cherry picked from commit b69e4d30581258d82d9b2a4daf932f75d7d7171e) (cherry picked from commit 0c1aecd7ec0d3bf9801c02ae24c89dd5ce074255) (cherry picked from commit 0304e41345e8ab19537d3686b5487c8cb4b280c2) (cherry picked from commit 4bcc7e02ce496bea54de39d1059cf39617d2a8d9) (cherry picked from commit 98364235f2792ce058984c03dde2f609adfbfc88) (cherry picked from commit ca465e97c1b5d1db684cf9fa1ecbaa14f4bb077c) (cherry picked from commit 653045ade1e2423ce363ffd2682c1f5cadf8059f) (cherry picked from commit 9ca2e644ab28c867a92925a6eb83ecbb6805434f) (cherry picked from commit 47c8a05b37d17201b24bab2d211d672e1fd6c2e0) (cherry picked from commit 4235d929ed1cb03e96c4f117a33b3120372235e0) (cherry picked from commit 10541c4b1c61ce6dc8c56481c0999e6ed52dbc80) (cherry picked from commit c1a0e1eb2f7673de83a57295531675c1ffbcdc8e) (cherry picked from commit 1c20bf30b2e9d1be68c6b2175fe33965a6bf761c) (cherry picked from commit d4b372db3108a350492d8dd8842cd6c98e7d3cdc) (cherry picked from commit fe3e43429979d8a9518861a5d795204038ee1f41) |
||
|
Earl Warren
|
3f94b9a111
|
[TESTS] coverage for SignInOAuthCallback
(cherry picked from commit f8e1619b993943eafb8ee12bf06f4cdb5862de70) (cherry picked from commit 46d8bc9bdf68b53767211dc103e6130f55bcdb64) (cherry picked from commit e0c7b7055f5f4eeca84f1d0b1260b7b9622d3aab) (cherry picked from commit faab747f8e7eb09262f755445462a77f8a6fb953) (cherry picked from commit 46acb6a9a79e7ce588b2863aa37bf26805afb2b1) (cherry picked from commit 22d964e74407c52ffcd3d3a84b0a66e2c186b0fa) (cherry picked from commit 4c8a6031acf760c2383d9e103c703ee5ececb8e8) (cherry picked from commit 032e8c7a9a357a13f41410063c2f7fb925dba5ac) (cherry picked from commit 7a17a3b0fb979e2923019de4b9a7318f578b73b8) (cherry picked from commit 8ea71c2a31ea7492f5f2e3de529c7fd0b232d3e3) (cherry picked from commit 4b027e2d37cb91c5951f1d10a018778b19590eb0) (cherry picked from commit d787089a5de09fa11f8e82a66ec43e4abdde1b2e) (cherry picked from commit 7b9999357a5d34861b5fd7390cc400f497896246) (cherry picked from commit 80eb531c380914c66d30a29159b81154e7adefeb) (cherry picked from commit 373b198bfbc29855c409294ee487639f83516a55) (cherry picked from commit 15781eedf755713ad4bbc83cf0b82e899e05d075) (cherry picked from commit 46bdb17a2fb25c23336ef493449ff3ff0eb05409) (cherry picked from commit 22ec6c11ee779cc06c2e6e6dca3213129033389e) |
||
|
Earl Warren
|
eb3235039f
|
[TESTS] oauth2: make it possible to use an alternate http.Client
(cherry picked from commit aea4ab25a93642b9032544e82299ef652162a092) (cherry picked from commit d386b212c48d0b1c8b50f947f11f08a0ad8c6d63) (cherry picked from commit c4935f08adc2830747905fdd051c551a7e3a0434) (cherry picked from commit dc6ca7cd25d82039a89c6b0d34cb1cfe80d186e9) (cherry picked from commit 25296d5a3cc48b8a6b3517a8e085f30208f681c8) (cherry picked from commit 3d54c64c5f7793e70201ed8b1d636aff2160682e) (cherry picked from commit 6ece0b9d0144b85ef3e3c5814e56f3d87cacf4cc) (cherry picked from commit 3b39962033fe87494f2318e4db89dd47182ccaef) (cherry picked from commit 5e2167cd03efc7af5782abb4fcfa009345a550e3) (cherry picked from commit e676d7b265d0784241c498645dcd7b6127071024) (cherry picked from commit 9cd258e8658af36f7149249e81a8923284c4802f) (cherry picked from commit 0a8d58c1592d0677819977bba4f08cad6a178865) (cherry picked from commit b66d06823a5634ab355e95c6171749c9bac93878) (cherry picked from commit 4fbe2a0047c2b78b5a329664f6c9442576d65bbf) (cherry picked from commit a225e0c9b419ed32f35699630af0d7b97e6a3395) (cherry picked from commit 21b670b9273353ec233c2840282b168150c0dc99) (cherry picked from commit d586e335d51dd447cc76b42dac8ddacbf99feb73) (cherry picked from commit 7ab21549a3014aa7f9ab55d6a9f35a8b1ca551b8) |
||
|
Earl Warren
|
6e4ae401d8
|
[TESTS] oauth2: add integration test helpers
(cherry picked from commit |
||
|
Earl Warren
|
43eaaa5a61
|
[TESTS] createUser via the user model helper for integration tests
(cherry picked from commit
|
||
Loïc Dachary
|
57e3c57c51
|
[SECURITY] default to pbkdf2 with 320,000 iterations
(cherry picked from commit 3ea0b287d74b8fc0dad08b2a539105e1aa1c1e67)
(cherry picked from commit db8392a8ac093d4d3760e8bb40c56d8e194d44fb)
(cherry picked from commit bd2a5fa2923c320e01faeaa1fdc1ad823c337027)
(cherry picked from commit 2436acb3d986bad08aa134e450420fc4a08f5d62)
(cherry picked from commit 62f50e1c521c30729781e5cd58882e743bb8b851)
(cherry picked from commit dba18925217254d22f76306c0fe1c046c419268e)
(cherry picked from commit 4b58e3b6d41f9e42fd34469184a3c7d4c5205c86)
(cherry picked from commit 12470568569fec0644319d3d263a82bc7acdc0c3)
(cherry picked from commit afbaea700972ddd4cb788d0b6d5e78de5558756a)
(cherry picked from commit dcd4813d96f8d4e429914f4c8f951bd25b23afca)
(cherry picked from commit b51dc963d1625bd7b9869302ec1ae70bbafb4442)
(cherry picked from commit 611e895efd28026fdc4661893172356e76f6c3d0)
(cherry picked from commit fd492a03f5335c138e143e784657f7012484bd8c)
(cherry picked from commit 2c99991f44a15466339bb82b29d455c66795721b)
(cherry picked from commit
|
||
|
Earl Warren
|
6d8d19b391
|
[API] Forgejo API /api/forgejo/v1
(cherry picked from commit 20b56692693e054bb3c04b4ef12b29b0715b4530) (cherry picked from commit 1574643a6a9634e5b92c033a4bfb69062a86bd05) Update semantic version according to specification (cherry picked from commit 22510f41306f9c133a7e99b61f9c38dabfd4b810) Mise à jour de 'Makefile' (cherry picked from commit c3d85d8409f1bb18a45659a167cf1ffee057f3b6) (cherry picked from commit 5ea23098513c068444226af41faf9be9c4c998e6) (cherry picked from commit ec5217b9d1b94bb04e34ce8c27eecbdc6f3a247a) (cherry picked from commit 14f08e364b2ad7e3176b45d3ec8da5f5605b4315) (cherry picked from commit b4465c67b8737aed9fd79a43046aa3795a298e68) [API] [SEMVER] replace number with version (cherry picked from commit fba48e64977a75e77c9c6cf8e3f8a679a5e7b733) (cherry picked from commit 532ec5d8782703b62d7d02312764e50637cd016e) [API] [SEMVER] [v1.20] less is replaced by css (cherry picked from commit 01ca3a4f4291cf4c62df42cbd12a00638f3cdc70) (cherry picked from commit 1d928c3ab2e1fda6082e1400d89ea96d6605ebaa) (cherry picked from commit a39dc804cd1da86444ed709455857f069475e7db) Conflicts: webpack.config.js (cherry picked from commit adc68578b3eb41215338125edfca91804706f8a1) (cherry picked from commit 9b8d98475fd7efcc15bf0d91b0af6ef3aff64508) (cherry picked from commit 25161039745a63282257eded9616390241af8013) (cherry picked from commit 18e6287963a0e1863cd08fd514a4e732a1904a68) (cherry picked from commit e9694e67ab93ad74f7eae3152d88d95e8493e739) (cherry picked from commit a9763edaf002c8009a2cca4115cb8b926f8cdc85) (cherry picked from commit e2b550f4fba144f9637a212b56bfe30cac1adb3b) (cherry picked from commit |
||
Percy Ma
|
e8d3f1cb57
|
[DOCS] LICENSE: add Forgejo Authors
(cherry picked from commit |
||
|
Loïc Dachary
|
6cb87ca0fe
|
[DOCS] RELEASE-NOTES.md
(cherry picked from commit b07123ee7b441946bdeacf38dfbabde705427f63) (cherry picked from commit ca85c880b476428b407c30b4b1776b2e008c9330) (cherry picked from commit 723ead94cb63e8d703f0159a02e2fcaff2f1bb30) (cherry picked from commit ff148318da221be77813675437026985a19107a7) [DOCS] RELEASE-NOTES: 1.19.0 (cherry picked from commit e84e43887beae3a2f18afb8ef71fdc17078413bc) [DOCS] RELEASE-NOTES: add scoped access tokens (cherry picked from commit 688f831853ef179d511cc7594dd23cc46ccef654) [DOCS] RELEASE-NOTES: Scoped labels (cherry picked from commit 747479a07b3b7b329016337025eddbc82c4073a4) [DOCS] RELEASE-NOTES: OIDC groups (cherry picked from commit 10c505fe8941b81824f08e4c6a39d12517c182bc) [DOCS] RELEASE-NOTES: Copy Link is broken On firefox it fails with Uncaught TypeError: navigator.clipboard is undefined On chromium it fails with Uncaught TypeError: Cannot read properties of undefined (reading 'writeText') (cherry picked from commit 148b2ff093fa87672aa09d09484b7803bbdecc39) [DOCS] RELEASE-NOTES: Copy citation (cherry picked from commit d0f217735f506d0f4fb414f38860d821cd1925b5) [DOCS] RELEASE-NOTES: Support org/user level projects (cherry picked from commit de845c7bcf4637f442a612fafb6a663c7dc69473) [DOCS] RELEASE-NOTES: v1.19 has a documentation (cherry picked from commit 9a5b46da32fa12c32215a0c0a8b233c14a10c9b0) [DOCS] RELEASE-NOTES: do not split webhook section (cherry picked from commit 00ed02032124ca75644ec2365f054c56d7e68d20) [DOCS] RELEASE-NOTES: Incoming emails (cherry picked from commit 06c455b33bf39a7595a31a983dbaab7e28795f55) [DOCS] RELEASE-NOTES: secrets are an implementation detail (cherry picked from commit 8236dc3a573f9cdb892894416268d3a115c77fd1) [DOCS] RELEASE-NOTES: Prohibit fork if user reached maximum (cherry picked from commit 0f80b8c696ef8c407466605588f341b710a023ab) [DOCS] RELEASE-NOTES: scoped tokens: do not duplicate the docs (cherry picked from commit 9bc4793c078e115ab5d59fda89fb43765dcb0526) [DOCS] RELEASE-NOTES: rss feed for tags and releases (cherry picked from commit 599b36fada5f12a3fb4e0eed4f787606af701e46) [DOCS] RELEASE-NOTES: protected branches wildcard (cherry picked from commit 2b316c495056b9ae9191f51f550eb0a5c76ae6c1) [DOCS] RELEASE-NOTES: disable releases (cherry picked from commit 9a60773f1dcaf241b43707c2009e0223d0b3eed9) [DOCS] RELEASE-NOTES: review box (cherry picked from commit 09867dd1220c66c6ad468f9f0a0a22740510f373) [DOCS] RELEASE-NOTES: asciicast support (cherry picked from commit ea9658379b25f9c1dec487fd5d9139d37735e113) [DOCS] RELEASE-NOTES: attention blocks (cherry picked from commit 70b387750b2fea65e68aa2b1486ffcfef0dbd2fd) [DOCS] RELEASE-NOTES: commit cross reference (cherry picked from commit fe706dad13db9f3ad4fd6699b20337712e7a674b) [DOCS] RELEASE-NOTES: strip user completion border case (cherry picked from commit 33ca51b4b699ba347d395796d80eebab09b1a2f6) [DOCS] RELEASE-NOTES: card preview (cherry picked from commit 626cd78ca6d2c95dcd90c33d0f9e3e99f48912e7) [DOCS] RELEASE-NOTES: raw copy button (cherry picked from commit edfb467d64190df7b8056e5ced164678ea5a1ea7) [DOCS] RELEASE-NOTES: allow edits by maintainers by default (cherry picked from commit 7006405bc6113f4b7acd26d91d1f928022d00bdf) [DOCS] RELEASE-NOTES: database auto migration is a little arcane (cherry picked from commit 78030fa9af4a05e2092d54e18e7b2dee2037c299) [DOCS] RELEASE-NOTES: fix typos & minor rewording (cherry picked from commit ae1d47f656df2c11c140095d8710361ebe545af5) (cherry picked from commit ad08ca9955304663367fa66e8d2097b78bc5b438) [DOCS] RELEASE-NOTES: webhook authorization header (cherry picked from commit c35e2c4f6f985be5763363ae2b03e5d23378f0d2) [DOCS] RELEASE-NOTES: video element in markdown (cherry picked from commit bcb0bd51d2114a7f086358b568928c3feeefea57) [DOCS] RELEASE-NOTES: move scoped labels to the documentation (cherry picked from commit c5eedaf4f398ca232ca65f132d504425dd8ac3ba) [DOCS] RELEASE-NOTES: cosmetic improvements (cherry picked from commit b93df350d96c0cb8b6b6b924a1dd8af1551f2263) [DOCS] RELEASE-NOTES: 1.19.0-0 is really : 1.19.0-2 (cherry picked from commit 60d770c2c95d841c597f619e73582bbdfcdb0143) [DOCS] RELEASE-NOTES: relevant repositories (cherry picked from commit de6ed5b87f845bb86f4d3aa4085f373958797ebe) (cherry picked from commit 71d91fdf22d04cb8d0c88eac87a9a59e1c558bd7) [DOCS] RELEASE-NOTES: semantic version (cherry picked from commit af062d77f0641426aa048e5975585b01652aea01) [DOCS] RELEASE-NOTES: reflogs (cherry picked from commit 084713d8aae787e2db76219f29840f006967ff92) (cherry picked from commit 90ad322a56bd67f717e32e8a1a419033add3655a) [DOCS] RELEASE-NOTES: fix broken link to OIDC mapping (cherry picked from commit 802a252eb5ddb411574cd7a8c9645fffd88de469) [DOCS] RELEASE-NOTES: Fix spaces (cherry picked from commit a605d36ab63cba34770b14e0073ee6b9dbb3b511) [DOCS] RELEASE-NOTES: SemVer (cherry picked from commit 7b29c90035f243944340952c234e2caec84527e7) (cherry picked from commit 82799195c9208d43a6c6d8da1fd6f7560f224b09) (cherry picked from commit 5d9c2e9ec67ea7d39532d61bbf5aed3e1161d669) [DOCS] RELEASE-NOTES: 1.19.0-3 (cherry picked from commit c599b2947d9da682da156fad459be76f09bda999) (cherry picked from commit 8a37027ae78f42f211e179bc4080488485982a87) [DOCS] RELEASE-NOTES: v1.19.1-0 (cherry picked from commit 89b9e96cc778a6cc2a063201252e9e2c1042a355) (cherry picked from commit 2b4e881a4e43ea0ab522e4d8c127a2b4ccdb10d7) [DOCS] RELEASE-NOTES: 1.19.2-0 (cherry picked from commit 0c0d2ec46cbc34d42b36af7e4096ee8e149a77ae) (cherry picked from commit 437b8caae4d3045c00f671758dd287f005805cf6) [DOCS] RELEASE-NOTES: 1.19.3-0 (cherry picked from commit 040740917e24c7d97ace3f46723e88163bafb533) [DOCS] RELEASE-NOTES: 1.19.3-0 (fix typo) (cherry picked from commit 24516cb22ab3768d076d5da87afa5f135e4409da) (cherry picked from commit 429c8e652549072d0c695b7c3e7c9f447aea8b5b) (cherry picked from commit 8247bddb45de2e5a275551d50a84ccfe5cc28e7d) (cherry picked from commit d77d7b7be72d0de250d97cdedb9381a1cdc1562e) (cherry picked from commit a64c899b1dde2ebeb620569b16cf982eb519e475) (cherry picked from commit |
||
|
Earl Warren
|
54e5a5dca2
|
[TESTS] add GOLANGCI_LINT_ARGS to control golangci calls
It is for instance useful with: GOLANGCI_LINT_ARGS="--concurrency $(expr $(nproc) / 2)" make lint-backend on a laptop where overcommitting the CPU degrades the UI performances. (cherry picked from commit 76023319c4275645b9c8c3bd896c1e60e1d57ae7) (cherry picked from commit 55eb05b03db15355745af83e612406baccc2b126) (cherry picked from commit 49c84de3dff883c89a3c0115ab7e0a06aad7bb45) (cherry picked from commit e8e26f08a6f31fc68797d6e0a927e75565abc350) (cherry picked from commit 401aa12cac3ad50ffa21c5e141d72e1d7cfd45ff) (cherry picked from commit 4ae8f663ad287269e1dc8bee19b3edcf41a431f8) (cherry picked from commit 2d87e4953b93204d2da530315e03bf311cd22e10) (cherry picked from commit e79be7d80e24effa110d4752525ab704ab6b16c0) (cherry picked from commit 65e367399867e13a9565e2553901be60036e27d8) |
||
|
Loïc Dachary
|
e5efb10515
|
[WORKFLOW] issues & pr templates
(cherry picked from commit |
||
|
Loïc Dachary
|
fe700ca401
|
[DOCS] README
(cherry picked from commit |
||
|
Loïc Dachary
|
87d1125ad0
|
[DOCS] CONTRIBUTING
Refs: https://codeberg.org/forgejo/forgejo/issues/8
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/153
Refs: https://codeberg.org/forgejo/forgejo/issues/123
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/299
(cherry picked from commit 08dcef0c8cc9cdf5d786a925f18c1ec0cf3364da)
[DOCS] CONTRIBUTING/RELEASE: https://forgejo.org/docs/admin
Because the version is not displayed on the landing page of Forgejo,
there cannot be a link to a versionned documentation. There must exist
a link that points to the latest version on the website for the
forgejo instance to display.
Better but more complicated approaches could be to:
* Embed the documentation in Forgejo
* Allow the admin to not display the help
* Allow the admin to display a versionned help or not
(cherry picked from commit 83cc38923935dcc7edca22756d6fc10988a58540)
(cherry picked from commit 5df52b8a4f6ebd184999a19dd10138a8e3980869)
(cherry picked from commit 9a66b3d70b6e7d2a3ee146d3708d48d8f9bfe305)
[DOCS] CONTRIBUTING/RELEASE: reminder to update FORGEJO_VERSION
(cherry picked from commit 2a4d0bd164e55fc981d9437d8220a9c1e00ca59b)
(cherry picked from commit d68576ba6762f4af2ed8133fe123fa84c136a90c)
[DOCS] CONTRIBUTING: updates
* Remove obsolete description of the well being & moderation team and
replace them with a link to the moderation email.
* Remove description of the governance process and replace with a link
to the governance readme that did not exist at the time.
* Add links to the Forgejo documentation
(cherry picked from commit df749da27225ee13b5e00b689b397b24afebd044)
(cherry picked from commit 4da39128c50e5e754f1404a5b79669a8218344be)
(cherry picked from commit f442ca6f4032bbd61185e488e5a513f4e4264559)
(cherry picked from commit 031928c447e4cbc293de03f6befbba05691810fc)
(cherry picked from commit 1e6ba47216f8cab267f555eb488f4e80ef503fcf)
(cherry picked from commit 8916a1f8c6358a85c2484a465a73a5d657fcb048)
(cherry picked from commit 663e28c41247e98b34cbd6cd32ce1b891f386989)
(cherry picked from commit d56b130baaa4dd13bc64f2f149753b7a2e40ae01)
[DOCS] CONTRIBUTING (squash)
(cherry picked from commit 0dc4b6e5c93e1abc1502149603839ebe30ab4e5a)
(cherry picked from commit 52f2163807abc5dcb35ebee32f695368be720105)
(cherry picked from commit 47d0ae3e10385b7568474c4f3cae1eb79961838b)
(cherry picked from commit
|
||
|
Loïc Dachary
|
68695685c1
|
delete Gitea specific files that need rewriting for Forgejo
Although it would be possible to modify these files, it would create conflicts when rebasing. Instead, this commit removes them entirely and another commit can start from scratch, borrowing content from the original files. The drawback of this approach is that some content updates from Gitea that also need updating in Forgejo will have to be copy/pasted instead of being merged. (cherry picked from commit |
||
|
Earl Warren
|
ebeb421177
|
[CI] end to end tests
(cherry picked from commit 0b43b1f091f19b875a87f08acbc5621bc749b3d8) (cherry picked from commit cfc205f438233987745faef61fd80336d5143394) |
||
|
Earl Warren
|
cf93863cd2
|
[CI] gitignore: emacs backups
(cherry picked from commit 5e418789d930ef8dc27bc5cb32f96350f5d64e06) (cherry picked from commit 3af6fd2ad38bfbe98ad72e20257704bced7988fa) (cherry picked from commit 6926787d67778f2a3bb2c9d79137a74b894e8b7d) (cherry picked from commit fe58e86a97d4ab0017908a55a9a1f240e241e3f8) (cherry picked from commit 5bf7ead6255889b5cc4ae81c3ce52d6d09e0aef3) (cherry picked from commit 44480ea79426581df15242d6ee7222be97709268) (cherry picked from commit 813848cebe61752568b9c28b9e912170e70bffb8) (cherry picked from commit 9c8d889e782ccaf3b3e71bd3abdc0777b2fd5cf5) (cherry picked from commit 914b1dcaf6d71354fd66c8c81121ad1f3e251e46) (cherry picked from commit 5449933efa74474273d882e7eb7c7840cc2990b0) (cherry picked from commit 67f007b8244c827bf9a9597834c8657440ce89f9) |
||
|
Earl Warren
|
0625fc7ad8
|
[CI] Makefile: release: only supported platforms
(cherry picked from commit 16381262c5231f5dddf94d3dac7274366f4ca991) (cherry picked from commit c93f41dcef679f35cb51f93b34b21cfd202ed68a) (cherry picked from commit cf17c69487cd5ad9e5338d6dadd49c208d604ca1) (cherry picked from commit 174b8cf3275cfb4efd483b04ad6cb6eaca069030) (cherry picked from commit ae1b8dd441b9902b098620dbbf4e88592460f91e) (cherry picked from commit 1b56d9049f2954b852fea1ae6e0c52076fdb4a0c) (cherry picked from commit 6b00196175db59d2c6b71a8aa01308265c92f26c) (cherry picked from commit 087b38c3f381cd589ccc708df102cf1594c09912) (cherry picked from commit 70fcc63816e57f277293b10a23777c4ad796e212) (cherry picked from commit 81e2f27426ec91c0a9ab7dd6f0eed11e360beb56) (cherry picked from commit 9741a9960b6bef27e36e679764cfa63b5cb7066b) |
||
|
Earl Warren
|
b62809313f
|
[CI] lint-go-vet: do not include gitea-vet
(cherry picked from commit 8cbbab7fefa62c66faba72d6f8ddcec33c5e6423) (cherry picked from commit 51113f0f29e2e7f9281ea568b8acddf6c26accb0) (cherry picked from commit 0d061e411f60bb4533460e1558646cdbc6a45aae) (cherry picked from commit 1eb4e7e691bf496b152916e11b991b16786752e2) (cherry picked from commit 3c3760f3b608303cc11e1cc3fea574e8166aeddc) (cherry picked from commit c11907373dfb8df7f974c726f46aee20727a9d3e) (cherry picked from commit d990fcf4469df8a4edede97e2c0980536ca98d86) (cherry picked from commit 62fd8a0b399802ca76bee0140f35357b2ddfd762) (cherry picked from commit 0663a2534101c0c6ed2fefd2eb84ce7f89bea4af) (cherry picked from commit c20d4386e530b56d9342a1403c682e86b5d25ada) (cherry picked from commit 5981040a197e002e6235194e92f4bad140572b49) |
||
oliverpool
|
35a7f5eb20
|
[CI] update DNS on experimental release (#1298)
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1298 Co-authored-by: oliverpool <git@olivier.pfad.fr> Co-committed-by: oliverpool <git@olivier.pfad.fr> (cherry picked from commit 2aebc5ab4d58a90ed79e5487776d4f3eeea3b33f) (cherry picked from commit 8d66b6e7bcc1f2eae06e1dee65b4b8736f217824) (cherry picked from commit c782935f1b3d54a928f81a4dcd19bbca52c6f77c) (cherry picked from commit 51e071da7304badd0f301771322bde7a86d33ef5) (cherry picked from commit 81dbc87e1639510c1026541eb944267e9cbdb78b) (cherry picked from commit 7a9820474341ae05e39e7de92cfe7501014dc91d) (cherry picked from commit c679954950fb7641f3b281b3d33ae5dfb23aef8a) (cherry picked from commit 8e4a03f302db5270967cb82ef0371429ba512f85) (cherry picked from commit 5846953f61fe9202f49a1b9330369fea0d664149) (cherry picked from commit ffda919030dee2c9801676a4470545269302ff88) (cherry picked from commit f923b26d1e2287bbb0f03c16fe741c2c34d934dc) (cherry picked from commit abfe5ec45d72098058af864fefb82414e2e4b99c) |
||
|
Earl Warren
|
e585db9a97
|
[CI] Forgejo Actions based release process
Refs: https://codeberg.org/forgejo/website/pulls/230 (cherry picked from commit 87d56bf6c73d726dae8aafbc7e147969f1899931) [CI] Forgejo Actions based release process (squash) base64 -w0 to avoid wrapping when the doer name is long as it creates a broken config.json (cherry picked from commit 9efdc27e49bdfb3e62401baf27b224385f9f3e5e) [CI] Forgejo Actions based release process (squash) generate .xz files and sources Generate .xz files Check .sha256 Generate the source tarbal (cherry picked from commit 7afec520c4b1032d7e67a05a41e4e2913bcd9312) [CI] Forgejo Actions based release process (squash) release notes (cherry picked from commit d8f4f4807b28297b318d2f555a76d0efef762cf7) [CI] Forgejo Actions based release process (squash) publish and sign release (cherry picked from commit a52778c74785fe57cdee3b64b4c6c8a326471532) (cherry picked from commit cf2ec6274094ac7aebda71d54c64581f528df00a) [CI] Forgejo Actions based release process (squash) version use Actions environment variables in Makefile (#25319) (#25318) uses Actions variable to determine the version. But Forgejo builds happen in a container where they are not available. Do not use them. Also verify the version of the binary is as expected for sanity check. (cherry picked from commit 6decf111a132a869f9e5c6f4d20e368b8f74309f) (cherry picked from commit 206d0b3886b2d56b585bf552e53d952b35f07284) [CI] read STORED_VERSION_FILE if available (cherry picked from commit af74085ebf51c91a51db865a66667fca511838d5) [CI] backward compatible executable compilation Add a new static-executable target to use in Dockerfiles and restore the $(EXECUTABLE) target to what it was before to for backward compatibility. The release process now builds static executables instead of dynamically linked ones which makes them more portable. It changes the requirements at compile time and is not backward compatible. In particular it may break packaging that rely on the target that currently creates a dynamically linked executable. (cherry picked from commit 84d02a174a4398b1f8ee62e08db5483a9859650f) (cherry picked from commit 854be47328cc0283119dfb78f9ba0b8306c85f75) [CI] Forgejo Actions based release process (squash) doc / ca / verbosity - Document workflow - Increase verbosity if VERBOSE=true - Download the Certificate Authority if behind the VPN (cherry picked from commit 168d5d586904835762d213b2b8815b458a38c78f) (cherry picked from commit 8756c9a72a40830441124256b7382f900a1052f8) (cherry picked from commit 2dad7ef20f3bf9ebe2425e2e28b66a4ca21c6786) [CI] Forgejo Actions based release process (squash) add assets sources-tarbal Refs: https://codeberg.org/forgejo/forgejo/issues/1115 (cherry picked from commit 5531d01f1981df665f5b8f642e9241e8ea4f4578) [CI] Forgejo Actions based release process (squash) add assets sources-tarbal bindata.go is a file, not a directory Refs: https://codeberg.org/forgejo/forgejo/issues/1115 (cherry picked from commit bd88a4477817be34ea86ebb2f460b9fe8ab5f1b7) (cherry picked from commit b408085138c578dfaacafbd4b7719ca926456855) [CI] Forgejo Actions based release process (squash) public/assets moved (cherry picked from commit d8c921d5a643ed05f2935348531996fe4d08c654) (cherry picked from commit f29e50b1a09b1a22fc2dbdb77e9a1def1196175b) [CI] Fix release notes link - Use substitution to replace all dots with dashes. - Resolves https://codeberg.org/forgejo/forgejo/issues/1163 (cherry picked from commit 96783728f53a072915cace392aa269adfe9a5c73) (cherry picked from commit c8d8bf8996beb650cd86cafb110e85e1e05917a0) [CI] pin go v1.20 for testing Refs: https://codeberg.org/forgejo/forgejo/issues/1228 (cherry picked from commit fd4b5a013ee0f31453b623d12001a8b810cd7ebc) (cherry picked from commit 00bb15f57f2ae5a11abc8b044ed99dc949e812a7) Conflicts: Dockerfile Dockerfile.rootless see https://codeberg.org/forgejo/forgejo/pulls/1303 (cherry picked from commit 6e2be54a6d95412ce770d4bab1a39c77591f44dc) (cherry picked from commit 346c418b4a8c0e1f8c9aace44b00373a4bf76732) (cherry picked from commit 49061f8422cb6aa9ddc14edb507f50477624eb7a) (cherry picked from commit 8229d59b7e1ba61959de6ecd95d9dd49bc2436dc) (cherry picked from commit 70d45d919309d8127551c8ad44538a730b795638) [CI] Forgejo Actions based release process (squash) need node 18 (cherry picked from commit 722b1f45902ecca3179a92700a2f5c1080422a04) (cherry picked from commit a91d786169fb4694aed4af68792437a0a67de3fa) [CI] Forgejo Actions based release process (squash) fix indentation (cherry picked from commit fbdf9d6abb88fd5def3d0ced488a4dd72655d433) (cherry picked from commit 2deff90a13397339796ac5a94d63b0d8cd9760a9) (cherry picked from commit 5710a27fda58093f0db1605585e730c314b933f5) [CI] Forgejo Actions based release process (squash) FQIN for docker Refs: https://codeberg.org/forgejo/forgejo/issues/1600 (cherry picked from commit f63d38deb6a9933ce996a61a099f4b79e9171581) [CI] Forgejo Actions based release process (squash) use forgejo-curl.sh (cherry picked from commit c0c3ef506fa500cb9626034c5e00913b3c31e08c) (cherry picked from commit 933ca7ec5dcab55c8593dee4a6cd13281502c41e) Conflicts: Dockerfile Dockerfile.rootless https://codeberg.org/forgejo/forgejo/pulls/1691 (cherry picked from commit 1068e48805de9d7464b41f32e1c5567d3747239a) [CI] Forgejo Actions based release process (squash) size optimization (cherry picked from commit 3c653ff7428dbf898a5131b5c817ce3b13ec0591) (cherry picked from commit 398567fc0cf9edd0be49541339800af985e8b1b6) |
||
|
Earl Warren
|
fc00ff45f2
|
[CI] Forgejo Actions based CI for PR & branches
(cherry picked from commit f9d75d4705ece5c119f2fd5e2bfbaf630d0bf739) (cherry picked from commit 64f76f4ab269daa6a584305164732c68be0161c5) (cherry picked from commit |
||
|
Loïc Dachary
|
d28c284993
|
[CI] Search .forgejo/workflows first
(cherry picked from commit 8b11cab677503be78b1deb17ed9dd5fb1c823a7d)
(cherry picked from commit
|
||
|
Earl Warren
|
0a8ef91302
|
[CI] disable meilisearch/elasticsearch test, no server yet in CI
(cherry picked from commit a1381d9146fba42cb97d72d38525fa3e721bfb03) (cherry picked from commit 74714e02461fb47fcc0901211668e4529fac68d0) (cherry picked from commit 7749dbfe6684498a47e3037088e7bef3542b6ce5) (cherry picked from commit 437924971136eaed795f77edd3d3dfffa5f68103) (cherry picked from commit a69f55bebf82a0b68bc0f66bc029eaea836cddb7) (cherry picked from commit 24dd5fbfdbc27c887dbc24661c1005fb2e14e3c6) (cherry picked from commit dda856d6b83936fd1c96c84544b086cbd8f63115) (cherry picked from commit bc14f4fa97fffe82d1c666e961e313f88433cb9e) (cherry picked from commit 78fef4f1379d8854901151d4bc62135c73db868e) (cherry picked from commit 69e013cc515e2a50006d8d02f575ff6490d272ff) (cherry picked from commit f173c6a2734b2dccf1424d27cd8e10fc296e44a4) (cherry picked from commit 92f9d02547017770deafd1f715c32ae4479b8ded) (cherry picked from commit c99d51e665370ceb71b96b3fb65184090c7e4442) (cherry picked from commit aa0650fd2b42738a5e564c229c3eb63b8ca77f9b) |
||
|
Earl Warren
|
854bcea905
|
[CI] disable redis test, no redis server yet in CI
(cherry picked from commit e1bbfa36197ebab97954e8195f7d36adf7c85d56)
(cherry picked from commit 91245ca9179a46047a351247dacecdace557111d)
(cherry picked from commit 705d0558be2c90d06e9e5b883044fd0b275b1113)
(cherry picked from commit
|
||
|
Loïc Dachary
|
eab1c72227
|
[CI] set PASSWORD_HASH_ALGO = argon2 for integration tests
(cherry picked from commit 1d7ce2a39c841e77492ef08c0e86c3544ecca88d)
(cherry picked from commit 3af8757583ab9bf8fc5eb05ed1e6901a34682512)
(cherry picked from commit 0b818152096d58e402e3c8bbc2415695af0cdfb9)
(cherry picked from commit 7180a3222a00c33ec7dc9bcaa7e5a1e3ae924735)
(cherry picked from commit 069044f4a6dd7457662e5ca296c714275d16becf)
(cherry picked from commit dd1438f38995e397399d8957fca696f82b73707e)
(cherry picked from commit 4ae6b5d64d59902ce003199b5d652d6c4799ffcf)
(cherry picked from commit c572666d78d0f2cf2a33d5a50ea363430ac9a0a9)
(cherry picked from commit de0a4480bc3e40d61aa5342d93a2ef510abe3826)
(cherry picked from commit 60272ef4f73608407ffedd27892376b6c36a7069)
(cherry picked from commit a68fdde4becef625ce4e654ba6ea8ebee55251e5)
(cherry picked from commit ff448cf3a698dd45c713b734fce3e374c99940bf)
(cherry picked from commit 208498caaab339d4543abfb2b77de3c5793a73c8)
(cherry picked from commit 1abd3efad842f276f1c768ab40213200b62a0d3b)
(cherry picked from commit
|