17226 commits
Author | SHA1 | Message | Date | |
---|---|---|---|---|
Rychart Redwerkz
|
8ca2104118
|
[BRANDING] Rebrand dump log
(cherry picked from commit b92a65a23f8d586d30336c79596ee8a73e6c2dad) (cherry picked from commit eaeb9f183ff9fdb9710b776bb26b0920e34065c0) (cherry picked from commit cdbd0ebe5eb4db0c89e82893cba503bcdbfe7bbf) (cherry picked from commit 8aaa4e3f4d67cb8f077ca1d115d04a9c966c18ee) (cherry picked from commit 6d7d3f048e3639bc9683ff157f7d9530dfc2e1cb) (cherry picked from commit 1b6a2971ad4c84e33ff882fdf81ca6f46ba3cb44) (cherry picked from commit 4f7f35043daecefa0ddb5c6f3afcf033d091c362) (cherry picked from commit 495a4351b160800723e159244f7aa843f536c926) (cherry picked from commit 12d89b03a97dba8468a4526d9ee6af40643f9885) (cherry picked from commit 476d49ff11d32deba7d087f097e656669f3a840a) (cherry picked from commit d6e95828c3f13f6a79d5657764d245701500a57c) (cherry picked from commit d043e8d69d942c0950180bbb3ab2c97783a022e3) (cherry picked from commit b06027344270d2dbd724695e8084a39b2e7563b8) (cherry picked from commit 20437285c553f8aa5c7a857c98d1680798eac592) (cherry picked from commit 0bc9eee5f31eacae875668e3cd4ba399ad98d9f5) (cherry picked from commit b9f843776f4a80d646743fd5cca2579ddf46dd5b) (cherry picked from commit e6d64de500e4324d574d1715cb5dc49b7bf672fb) (cherry picked from commit 5ce2ff2f8b7049c5b3e1ce5bebcaf40368ea7641) (cherry picked from commit 659677cf886c396a76aa7426df312d5ff44ce094) (cherry picked from commit 648a5d944e9e9bb1a9a09cdc37b311db0a7f3f79) (cherry picked from commit a77c8be7042cc67c6043732cffabdeabd42d117d) (cherry picked from commit 012cb570464deb87060322b43da872362ce69533) (cherry picked from commit 2da63c976eacf9c481d9561539e2abd04c0b5ea6) (cherry picked from commit 792ce8b1b7045c8559d39aaa4dc86ef24609034f) (cherry picked from commit a4b3244712317fa64e27f8d471203648113759f6) (cherry picked from commit 9ffc3571f184430502ce2b63c80e6f25661dd885) (cherry picked from commit 6aadfd01201f5c715b2aed1a73a3832b9722d81b) (cherry picked from commit bdfc590b568b72c6687e94c512ae06bb864d032a) (cherry picked from commit 6d4f25799f1fa60ba586cf211ddb6aa8c59b4739) (cherry picked from commit fa39bb1b0e5183481f1c8c6c9e27e37377561d54) (cherry picked from commit b9f86b4dc5e600dedd5cbd9414268f3c247bbf98) (cherry picked from commit 14a60da5b3fdbfd262ee6474053a0e86bb0829e8) (cherry picked from commit d198a93f7094549aaa7623b8194f5bc09279ac87) (cherry picked from commit f74a07d872e05d71aad6ed9d4f0e37e7ea174987) (cherry picked from commit 50460b09256c58132ca8ed1a14dd818ee376244d) (cherry picked from commit 762847ef0c8d8c9109c12383a09b94f47b8728e8) (cherry picked from commit f6ebea410d4845f0e154fc51df1ef96aac444987) (cherry picked from commit b08e1dcfa9f81c79b65d76cbfaa92aa0ec0e3763) (cherry picked from commit e5e4f184888daf90667fe8a7988f1a072aedba65) (cherry picked from commit d8c600bd79e16adb1576006af68a7191324ca852) (cherry picked from commit cbaa08770d5ee048439db37caeb01285929a5ec5) (cherry picked from commit a49d65476fe0202c30de14b03d42eff0481ffa46) (cherry picked from commit 2e3682d519d44cbd8b6cccbf2c7529b957c65231) (cherry picked from commit 0a45629b70d112f4f00252fa7de6a96e1b56078c) (cherry picked from commit 6629c8372537191a9b6b97d4ce646a7adaa7acce) (cherry picked from commit ee5169a867e348e2f44dc233355f760c3e4affce) |
||
e57504f278
|
[BRANDING] X-Forgejo-OTP can be used instead of X-Gitea-OTP
(cherry picked from commit 7b0549cd70aa7cafec853e15b25270847c59850b) (cherry picked from commit 13e10a65d974c7b594681bfa36402a6144862116) (cherry picked from commit 65bdd73cf27895a9fb8db2a95ef4f5b08951481d) (cherry picked from commit 64eba8bb923176b4c286b1d0c83792f3c3005ca8) (cherry picked from commit 4c49b1a759abe3604afc1121e83c9a942016ad6a) (cherry picked from commit 93b4d0640683ea986657453b1fce49a00c861764) (cherry picked from commit e2bc5f36d958f4349160ec145719c302d4023cd0) (cherry picked from commit 2bee76f9dfa998c83ea4fe648997fad0b6224fa9) (cherry picked from commit 3d8a1b4a9fb9dc55bbd62fd8855ea85e58dc263f) (cherry picked from commit 99dd092cd02d7af8374acf454833ce1c05fd4fd9) (cherry picked from commit 0fdbd02204d533f907cd22c83c73bf0156ec4a88) (cherry picked from commit 70b277a183c0d85966fa84e9b054f164ae2d2a44) (cherry picked from commit 3eece7fbb4e67d970d8979d0d60a58ee2a195ea5) (cherry picked from commit 4838fc9e1145a74c56926de68854234604b5e38f) (cherry picked from commit b76ed541cf4d73702a83d6b96f8618b6f8c44393) (cherry picked from commit dcdfb5b65c6fbf50798a0c49d0f879dd1285ee41) (cherry picked from commit 377dc48cdc3b1c2bcc95f86a7bf3602468ac5c39) (cherry picked from commit acc862f411c79f7832c8ba2c182af738f25f4f8b) (cherry picked from commit ac75ef101f89d58442760cec21a3f3f9199d4710) (cherry picked from commit 08f2d9f7c5b0d51358b009b0b38b626b231ec32b) (cherry picked from commit e4096f0b6441ba68719146e5a48ef44233e27a86) (cherry picked from commit bf5876f06224ac90e931f2f47b66a5b9c38b2a87) (cherry picked from commit 7dc60637e5e097b5dbc38e068ee7ba553385b496) (cherry picked from commit ef3101774ba5083e259d84db9997ff0aaddab14c) (cherry picked from commit ecb9e8867c3503387cbaf97df27d8c60a840f4a4) (cherry picked from commit 64f0ae72fec30ea443d73f8566c140682e7b9838) (cherry picked from commit 8dd6ec786294741361f79c08b0c051d2258bda02) (cherry picked from commit b36723e52b975d2e57af363db1d9118f48feade1) Conflicts: modules/context/api.go https://codeberg.org/forgejo/forgejo/pulls/1466 (cherry picked from commit 5c378e0cb823f2bad52224859ca326afb33bfd4b) (cherry picked from commit 1d87602819be9f87bf9d06203c37160568c18e78) (cherry picked from commit 0f72002d667224a75a4924ebb5557eca8bddbe70) (cherry picked from commit da2556eb13a2c976d1630315dbee8c3bc5444a11) (cherry picked from commit c01688cd900369b8cbed961f6a841ea536b07207) (cherry picked from commit af4bba832962ce4db3327c140283ce5b8d2cf6a5) (cherry picked from commit 33ca322c2ea7b05fcab084e06f8b3a6d65125808) Conflicts: modules/context/api.go https://codeberg.org/forgejo/forgejo/pulls/1739 (cherry picked from commit c18e374d4481592681ae127b723f11076c37bb91) (cherry picked from commit 27c4797c9fb3c42be252223ac0add0605f18acba) (cherry picked from commit 46588e0fea8f505de6c1a4384ae88f1cd661eea2) (cherry picked from commit b8a02ef220e3fb034d4204d5c70ffe4df72e7afd) (cherry picked from commit 05e2f49b78214d7fd48f4b31d1c9b1a7917a5e10) (cherry picked from commit e4df86d312b32f38753bf7ce1ae7953e49095d5c) (cherry picked from commit f36e06da43110c177e5e9db21a50cc96885f3e2c) (cherry picked from commit 64d336c287880a774d8eaa41193cad84e291e4b5) (cherry picked from commit 2af1cbb017f372e41482240cf0cb0af51d77e2cf) (cherry picked from commit 920741a9d667bb3b61665669932b449722883fab) (cherry picked from commit 6cbb37c8c47eb32289d0d65ad9de3cd7fff947fe) (cherry picked from commit 539cceca39f475c66d7d4fc64e10667664731f76) |
|||
ec3851d5a7
|
[BRANDING] alias {FORGEJO,GITEA}_{CUSTOM,WORK_DIR}
FORGEJO_* environment variables are set to the corresponding GITEA_* variable when the cli starts. This approach is intended to minimize the conflicts on rebase. All occurences of GITEA_* are left untouched in the codebase and they are only changed to FORGEJO_* if exposed to the user. (cherry picked from commit e466f9d10e145a3ed750f0c86cfcafad5f141ea8) (cherry picked from commit e33e95931b0d91c41433db68ddb19a8724b8ed80) (cherry picked from commit 2cfc6519b7cbc758f8322fd7f7b84dfc6d14ae73) (cherry picked from commit af8864373a65441c817dad1c3b696157c4024a7e) (cherry picked from commit a0550ff3391f0575b72c3d0d1fdf1fcd9b51e4d6) (cherry picked from commit 24dc0a5191a26fac0aef6b3a53fd58b9185edc88) (cherry picked from commit e255eea2b48ad39eeb3eae227ca0d4fd4b667d99) (cherry picked from commit 0c4f5afa7a37e6b805efb452b9d4166f7e2cec61) (cherry picked from commit 42fce708d05d616ebbdfb2eecf384ad2fdaa1d7a) (cherry picked from commit e7278c3c22b656e5730ec2ba0c1b4ee2ef6627ce) (cherry picked from commit 0fb9ed7e0eb5db59ab5b574d3d69b4b161f50b0b) (cherry picked from commit a98308aa4d6659f46f7f69996167f9c2f3c4e859) (cherry picked from commit b8695fcbe04792cb75acb62fdf9c6dee237e8365) (cherry picked from commit 4aee8719f57b40f8645905c10ba8966b29052295) (cherry picked from commit 1c503c1ba7414fe0b960187bcc370b44c536ec7f) (cherry picked from commit cf1ed8551e6a8abc56d3ed45b65b0e6ca4e1e891) (cherry picked from commit c52459b088cd52bf3b11b68cadf95d738fd09269) (cherry picked from commit 92cac277b28f9b68d3346f5dd463bc41c1952af6) (cherry picked from commit 2c744f11189ca76de62be908069500d7dbfc2a8f) (cherry picked from commit 989a98a8c52342fb146938c41c1db9a0818013f4) (cherry picked from commit 9cf7052bd4c126618833487134cb39dbe6d58297) (cherry picked from commit a13c9667e04555d38106bf7e63d57b05002b20ee) Conflicts: main.go https://codeberg.org/forgejo/forgejo/pulls/1216 (cherry picked from commit a9c3cf060d76ece0664b05f03690bd3a7d8f7089) (cherry picked from commit eb6d904b23bce2bc02ea96db0459b7b7a8e55cae) (cherry picked from commit fd4878e4877ced8a65cb348c69220b688556a214) (cherry picked from commit cc2cab92410e13abdd88c6ae8acfd17ee6e7fb0a) (cherry picked from commit be523c63dbc7d3dc1f852bb7aee045cf2d9f74fa) (cherry picked from commit 254d1a2f9a9751cb2e0d9475f2f6c7579120cd32) (cherry picked from commit 1eecf4200e2c073c13675f769bd1254fdcc4079f) (cherry picked from commit a01f5c3475991ae2dfceaa17ac3dd7adccce3d5f) (cherry picked from commit b1ba7ce32131a4868a734fec1aef64bd96150fbd) (cherry picked from commit eddfd96beb24604179ac80175e717c334cdb6d75) (cherry picked from commit c9c9b7e49bd298b4e1d1c374a8829e434f140d6e) (cherry picked from commit ad7e871779b18b8265ddf4c06566cff90f494c89) (cherry picked from commit 9073ed215bf33535a3764b834e2e16690af72679) (cherry picked from commit a827fdadd391159cd928e767b08e9d04473ed145) (cherry picked from commit 39e66246cd75800f26bdde94b421893ad2701183) (cherry picked from commit 46d1c778a2fd5030d7ad48b27ffcf18f04236e54) (cherry picked from commit a65bc0b75dfb03fe474ad47003aceb7c751d890c) (cherry picked from commit 5f901e967161a1768b8d1da1edee23e1eb2f8d79) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1976 (cherry picked from commit a0e017d206ade5de9dacb7794052dde38aab3616) (cherry picked from commit e6e24b96312ee9090865f685e299b2073bb918f8) (cherry picked from commit 00667d869b593fe50c1236f902c5656b5f4265c7) (cherry picked from commit a9c5bc38e9960c06807c6464c02876b21813e79c) (cherry picked from commit 671ef86e6dcccb168380033c7a8ec09dfa135f0f) (cherry picked from commit 5063fd6b84fcf4814a3c5c6a8dbdb0ae6b05531e) (cherry picked from commit 5c043c2aeffce94980ad5efa348776cf57720898) |
|||
ef25d18d9c
|
[BRANDING] reserve forgejo-actions username
(cherry picked from commit 2a25be788bdf3b58b236cb2a9f503b569703a0c6) (cherry picked from commit b270d5815c80f387759eecbfcb588e548f5ed956) (cherry picked from commit e7382cc71e43c52abcabc59d09128450ce415d26) (cherry picked from commit 665400ea1e92405f41590bccf800714440ded50a) (cherry picked from commit f5b2c691f17d6a66fd8041a83b36194f7d630339) (cherry picked from commit 3df97adfefac63ddd1d44cc553a2c81087706d47) (cherry picked from commit 494f6eafc15f235cd7ca5d4f01e7ac16eea8bd5b) (cherry picked from commit 822e3d2c833e2a92d337812a93a6c78638b14456) (cherry picked from commit 7460f1256852256048e7a7eb1dad108a0caa3567) (cherry picked from commit f6cd70881e828688a73f277252cdf1bf1904fbe2) (cherry picked from commit c669ce8173f0f819834436fd571d25c8678ec187) (cherry picked from commit 1d5a433e0282681c6ebcd9ee0cb5deb644509f7d) (cherry picked from commit c1a4dc150c617a8210c5907e9d93e41f01a01a2f) (cherry picked from commit dd1c971c6c86ae80323c47084eb724d305428943) (cherry picked from commit 8d2dcd9b1ed055875bdc123aab6bf6ea54539296) (cherry picked from commit b6bb8fd2750c76454cbc014134d3a6049021ca5a) (cherry picked from commit d4b71fe96e043389453a6595ccae0faae0113ca3) (cherry picked from commit e204ec0b2359b85bde65d2b56463dd8e3655405f) (cherry picked from commit 8d9f1174bd568fa8c74e433981b3bf79ba91bfbf) (cherry picked from commit e314a7d5ba2aea572bffe8c69e36cc60ef7663f5) (cherry picked from commit 48b3ad5a303900474ad87014d90889c9fd4a9b9c) (cherry picked from commit 71ed4b7c694ab6ac7e2647274b202f49c9502e0f) (cherry picked from commit d63324ccb647a93c026a5a01ccd79cd73ec8b600) (cherry picked from commit 9249e893dbb096418945a462d35327013f865bbc) (cherry picked from commit 78f156427b6ff2dd6e7dc4092f7ea4e18786cdb0) (cherry picked from commit c3d4a1a602712ff64f152a0c78d2ac438b957dd4) (cherry picked from commit 83b1855f559e315143cdd82bc9f028c1302cf9b2) (cherry picked from commit 319815d9b1634dfe99b00fb8334d4342280b5d57) (cherry picked from commit c4fcbfd2972b533e85e934ba5f23478c52b86dea) (cherry picked from commit fb58c852229b8944725d1fe48496cf2e7878af34) (cherry picked from commit 69c24e3e8b2775e0ff8d4dc95573ad922f8f0be8) (cherry picked from commit 1e9ec4737a2a514253038ccda5b05436c216ab7b) (cherry picked from commit 70439970c1f1b0d19e8084fe819665a780a9f6e7) (cherry picked from commit 7e6146c1a85108fd2226e3d403cfd81617fdf3f1) (cherry picked from commit 7adf6d586919e876dbf1729b82065664730a9657) (cherry picked from commit 8985e1734365d2a887c3842b1b5e051b41620bad) (cherry picked from commit fd4dc3ebcaa05243070bfa4f938d534c11ef5471) (cherry picked from commit d31bf1639e9c2e7c2e59b17c00f0797177aa3ce4) (cherry picked from commit d2a9b6dea0f9b0587141a85ca2c757f3d747cb1d) (cherry picked from commit 0d9279bc857edc1ef47e106d4ba3fce1eec7589e) (cherry picked from commit 0591a15cee319048097a8f61d9a7b64086303007) (cherry picked from commit 3ad88f11467c59b5f70631ac75d2e89974c3f83f) (cherry picked from commit 5501f5b2e54f555415a764580141e565ca0434e0) (cherry picked from commit 9b9f62f7744c924769a5ca0d300abe6470f411c4) (cherry picked from commit dd2e5f525d4a5461c7292bb4c7611dc79b85dc5e) (cherry picked from commit 9b489fd8a559bae26b1e4636b134499cee80d558) (cherry picked from commit 60c820562a9133d69a52ff911f5c67a18c8c6b75) (cherry picked from commit 084d73231711affbd09559db64963e4932712a7b) (cherry picked from commit e1bb077d6e76797c3a604f298843b3cdbfb57dcb) |
|||
Gusted
|
8b5941a12f
|
[BRANDING] Update nodeinfo branding
- Change the values for the nodeinfo API, to use branded values. - Resolves https://codeberg.org/forgejo/forgejo/issues/257 (cherry picked from commit 4608c57688d8b12dbc265dd21bfe7cd269efb116) (cherry picked from commit e837e8a52943f803a40cd0151e24f7fe8edb11ec) (cherry picked from commit 6601328d3ce9b57dbaa768dd2d41295293ff94f9) (cherry picked from commit c6be21d4870e6b748a85f0da19bd4b717875b224) (cherry picked from commit 5adc6ffee2e6f1af72039747df809aa6ebd2198f) (cherry picked from commit 2ff8d166ac1e56ab7a349d70f875bd2ae9763418) (cherry picked from commit b6a90e7e5af0e998cbbf1fc1edb901ae31090999) (cherry picked from commit d1089e706cda009a6a23462adf498fd24a609b0a) Conflicts: tests/integration/api_nodeinfo_test.go (cherry picked from commit 7a29df737d979abed4d37f084e3a92ee788d2c6e) (cherry picked from commit 3655a30c60229167bc007e139d0461a5648741d5) (cherry picked from commit c90d61141016ffbbaaa6b4f4657dacf5446f30c0) (cherry picked from commit 0274bd8860bd00de628fba990e42bf7385ddf5b9) (cherry picked from commit fdb786b71decd1c968f7c473c94463140f192fc3) (cherry picked from commit 4f08f100a19886210b89d1cacfd09e6db0e48fb7) (cherry picked from commit 56a27118227521fae93e052bb77265fb10c6dcf8) (cherry picked from commit 3b2cfa452df0d2651a75c5e3fcd442c38acff109) (cherry picked from commit 773ddcf956a897bbaa75aff3087f8a64b254239c) (cherry picked from commit fe8321ed4e9dcf0df2dffb64b0245ec1ae8f075d) (cherry picked from commit a94833643b6796000a69c7ff4dfbc0b5df98b0f4) (cherry picked from commit 3fdbda7639f0690b1dc8b046a9b1979571714d41) (cherry picked from commit 7bc63d2cd3144d00cbc9429297b994382140bd5d) (cherry picked from commit a36400d9cf4392573d8bd13ded54a4c5689dd541) (cherry picked from commit 2535ab42016132c2ee7882d3eb5eb42c00ed7e63) (cherry picked from commit 692e72f4f64b4a0251ac7ac99a268b531d73c6fc) (cherry picked from commit 265021f3e9f327da96df695f90d6e9d0a23dd824) (cherry picked from commit bc833125d6b0a3c7b0fc117e3bb081cb9ec6f02c) (cherry picked from commit f1f9f881559c4117a547afaa379bcd0c26afb1aa) (cherry picked from commit 6076461ad7a77e77ecbd9963689435496d1852e6) (cherry picked from commit cd1da0aa2bac7270b3da2c5b76da2ea197a2f32d) (cherry picked from commit f4e9a251d80363360bbcd9280c68421e87ec1630) (cherry picked from commit fed4a421acf90bbce18c120ed08995f8f212bcf6) (cherry picked from commit cb3ef3211768a1725198aeb547937329a5f98b8e) (cherry picked from commit 232eec1945c0adcc61b6a4e855fcff0d346c3ab0) (cherry picked from commit 1390cd433a51f99c0fa5508a78f3160e5af8da69) (cherry picked from commit e1fed5dd7ffda2bbd1898ecb112146af16b94e37) (cherry picked from commit 5797dcbeb71406cf288354dea0efc40567743bfd) (cherry picked from commit 7591d86b439a437976b378d946ff73961bd3bd98) (cherry picked from commit 96eea095f672a36b88889c8825b753615ef62fd6) (cherry picked from commit 0a29bba0fb7feb982d2f27212404c6adba04a535) (cherry picked from commit 075da8a23764d2ad3939e20357a00cf20c3f62e2) (cherry picked from commit d2a3085458415d39cee9fd5060427c0783e7d13e) (cherry picked from commit dd39faa96c4367b91cec014404eca88ab370d00f) (cherry picked from commit 9f15e5cc4926b5a1f036a592a48ec940be0a8561) (cherry picked from commit 9a7e041380992d556e1dafd9eb3faa6f528b9f8a) (cherry picked from commit 798aaadeac23ce2d334544b4757e37c774a74c7e) (cherry picked from commit 8489bb91612b04c7bed8055b017c72a238b5081f) (cherry picked from commit 0457646ca5657e0491d6202d565a7463043d1c34) (cherry picked from commit 3ca76bc33f59f321aa5ed4cc2bf0ad2f02fbd9fd) (cherry picked from commit c98047aa4d200dabf9a64b2bd30f35d6b33dbb89) Conflicts: tests/integration/api_nodeinfo_test.go https://codeberg.org/forgejo/forgejo/pulls/2299 |
||
Earl Warren
|
e20cd83bc5
|
[BRANDING] add the forgejo webhook type & update webhook docs URLs
templates/swagger/v1_json.tmpl updated with `make generate-swagger` (cherry picked from commit 88899c492efeedd138ba088a36b9c0bc733ead7b) (cherry picked from commit 7171bd9617c32c4911e3bdbc23c02a19e80d2465) (cherry picked from commit 1a742446c17aef9ca62fe75bfc0a388d40138154) (cherry picked from commit d7c189d7b2f9fea299a31adf068db969920ae39d) Conflicts: routers/web/web.go (cherry picked from commit cbdea868e41fb38ca491f8b449c3e525ec82d6b9) (cherry picked from commit 6cd150483b06e17aee023c0afd01a3f2460b3415) (cherry picked from commit 47246da8d3f50a02d11b77b3d402618b144aa720) (cherry picked from commit f2aa0e6b769d432e627798bcf294b04b7d253213) (cherry picked from commit 5a4fc69a16de8d6199ea24198299297ef7a3587b) (cherry picked from commit 48e444ca09c22f930514a01846b0c8bc3cef35ab) (cherry picked from commit 888e53781175d8d977f66d78991bd66563fcddfb) (cherry picked from commit 5121f493c99f19d8050aa09224ac3532b4100ec7) (cherry picked from commit 9394e55fdf80bf3d7bf8b2aba561ad44a84e3913) (cherry picked from commit 3a2ce51768de65892e3ec73596e3862354c9502e) (cherry picked from commit 719ead3a651f12afbb59c856914b0085e5cee157) (cherry picked from commit 83e6f82e2aea619a3cd502e133773d33c0e60133) (cherry picked from commit 494a429b21c6234be38b9e3db0f930fbb8118205) (cherry picked from commit 4d775db6b41f731e956cc6bb9217ef349b4a3635) (cherry picked from commit b68f777dc2822ec5c4e30186675cc82daec092a9) (cherry picked from commit 5b934023fa58820f27c349c26f2a1ce89aee6795) (cherry picked from commit 3b1ed8b16c73374cd5b6339f5315229dc82488da) (cherry picked from commit 6bc4a46c9fc6472e1c4bf0bb20dea6867f1b392f) (cherry picked from commit 8064bb24a3c752a86271f154ad4d0c4763e07295) Conflicts: templates/admin/hook_new.tmpl templates/org/settings/hook_new.tmpl templates/repo/settings/webhook/base_list.tmpl templates/repo/settings/webhook/new.tmpl templates/user/settings/hook_new.tmpl https://codeberg.org/forgejo/forgejo/pulls/1181 (cherry picked from commit 55f5588a9150d8912c0f8342495f858e4e1e2959) (cherry picked from commit a428bc06b353e7b678acc6a1ec2576608f1a5d9a) (cherry picked from commit d2186eceb960773d037756c991f50d177fd63954) (cherry picked from commit b4e126e9afd1c51b214e36a585bb454dac32862f) (cherry picked from commit e4c7a92c2d7142cac74cf05a2b1fe3f0bd0c7373) (cherry picked from commit a7165c8146a604b6ec5f8ee4db4c926fef180857) Conflicts: templates/admin/hook_new.tmpl templates/repo/settings/webhook/new.tmpl https://codeberg.org/forgejo/forgejo/pulls/1420 [BRANDING] add the forgejo webhook type & update webhook docs URLs (squash) gitea logo for gitea webhooks Refs: https://codeberg.org/forgejo/forgejo/issues/1367 (cherry picked from commit 2d8c1b93734acec918729e27c5613a8f9fb41ceb) (cherry picked from commit 9135a5e1dbcff07e9fff4c1001fcac8c05e0c82b) (cherry picked from commit 270f4020b0714ac553498fc986457b0c627d85a6) (cherry picked from commit 33e5e2f0d898639bae05225437aeb4afa2678360) (cherry picked from commit 7af8bcf4791ade3ca80d449629bb2eadd0ad25ba) Conflicts: tests/integration/links_test.go https://codeberg.org/forgejo/forgejo/pulls/1548 (cherry picked from commit ce2a434dcf9ad23337aaa0cc30dc069bbc79744c) (cherry picked from commit c2fa42b4fda37db8d5d4efc11834546d5de3d6ad) (cherry picked from commit 3858c8d4db2ceaf79bd5ebed54382cbdd6491a5b) (cherry picked from commit ebb0ae49208adeb5da4c6b442990db1b1dbe91d0) (cherry picked from commit 93d354c418e6da1971dd7f1749cb700627f1f6d2) (cherry picked from commit d5b08a2a4be2a48925dc089f5ec312188c60036c) (cherry picked from commit e5e5caffaa69c2f2be300cc97ec500a993ac6b3b) (cherry picked from commit 974d4057000f6989eb4b3440271c78dc05927312) (cherry picked from commit e654fbccb1ddfd9e494ce4560e5ac1620d85f7c6) (cherry picked from commit 85515977fb2fb6f6ae13f7b011bfe9f9c6d0425f) [BRANDING] add the forgejo webhook type & update webhook docs URLs (squash) ctx.Locale (cherry picked from commit e192647bc0f1d19b144e5ab1b286e11b2466eecd) (cherry picked from commit 95fb1b724201b4d0dc1ef0ffb2745b2977c73286) (cherry picked from commit ea7bd8022fc780b83de4a9ef5595cb0067e6e9d8) (cherry picked from commit bf8465ccd07a0be493d2faf21e1e2c62766513a4) (cherry picked from commit e1baa0a3007e2cc9a569da7d1e48785744d5cde6) (cherry picked from commit 01b4f4c51428fad992e95615e3d55be54b4f84f9) (cherry picked from commit da330b1e51916bb3b55167b5fefe86787a470e1f) (cherry picked from commit 7b26c27c209c7ee5dbb45b74bd253c1bc713f5b5) (cherry picked from commit 0c781e6f6d411335b4d22cd6a691b409379eba62) (cherry picked from commit 0f663a8414e248f67d18896863d34f03abd9738d) (cherry picked from commit 3297fd4f15ee7885d7b88c79e1ce70832cc60f78) (cherry picked from commit 2f4ef403cb9e92c0a0785b860747283bd754f826) |
||
Earl Warren
|
ec8f162b33
|
[BRANDING] add X-Forgejo-* headers
(cherry picked from commit 0a3388f93f53f53cce79ebcc194d67979cbe61cc) (cherry picked from commit 7eba0a440a3138443d0b7461560f9f6f1c46b256) (cherry picked from commit eb9646c7ef0b1a9e73bf22806acbc2caeaee7ff3) (cherry picked from commit f1972578f5cb72ad9e1ef1ded9aa324b1d669864) Conflicts: (cherry picked from commit 7f96222fb4b4a773193a11d4ba76f449013c30ef) (cherry picked from commit e3c7c9fe7b5809cdb75f1eb629c82b27986f7e98) (cherry picked from commit 84fdead90242e68493efb96a7fee1e3b5fd417e9) (cherry picked from commit 85148e11961b86269b7cda30294a4cdc817787d0) (cherry picked from commit c0086bd70d39d9a1075fa624cdbfdf5ef26f7a2c) (cherry picked from commit d1e31ef31817e5e811f6bea7aee5582383d53b12) (cherry picked from commit 681d3ed5c43d45f802dc13c58c5b821da938374d) (cherry picked from commit 76a3001f5bc5a064054514c179ba14008952e914) (cherry picked from commit a55a9567d36f6b60557df3df3a0801c0fccec963) (cherry picked from commit aa7adc167d4e4ee7879b88fe799f2afca2fd5531) (cherry picked from commit d5354cb52c26ab0090388d019efe61770e7ec452) (cherry picked from commit 472c48999699420d15aaa7c61a42db8136221616) (cherry picked from commit dc816d065b715f2bfdc7fa68fa2d254f3d481b35) (cherry picked from commit 4795f9ea85eac21c70db1159914a7b7b035b7374) (cherry picked from commit ddd4ae53433d4adab823aa974c0f1c39d0394414) (cherry picked from commit 0e95f2a36b1c0f480f94fef85d341792c7a7b759) (cherry picked from commit 47a41a4e7b3c5d3cf247dafef17a64415069f171) (cherry picked from commit d4416fcd3ee0f1d74c2b03fbe40c15b83f80b56d) (cherry picked from commit f279d153b61677e2a766859c7a7688b0327e7c9a) (cherry picked from commit 959f908ffdc9dd2fb07aefdf7cb85ba34f9071a3) (cherry picked from commit 82df95310176a083abb9eaa51de9e9754d4f72c6) (cherry picked from commit 8f8c9fd9e3deca0af0f087fc44fcd271e8440a7b) (cherry picked from commit d4a0db7706f30a394192c6023072ad5185a7d600) (cherry picked from commit 44594d623942128072bd86a20b5b90603517005e) (cherry picked from commit 62b1de579ebfe326340b218cc9a980b705b8e6a2) (cherry picked from commit 507abee353f120247276fe9165f09976421f926d) (cherry picked from commit 8c36ac42c7091661b2f3fec70fc88a74043628fc) (cherry picked from commit 72f74067f4c781e1c4936f0da2653a35a6f1c82b) (cherry picked from commit 8e5a9e187b50a6eb8523c6dda4ce1a23c08a0b5a) (cherry picked from commit cff8f43c7e4ab86a468ea49f7b945412d9911151) (cherry picked from commit 493cc93e6d4b738a5b81d1a0db831bf9f430e9de) (cherry picked from commit c94352b4d460e631c223b45516e42765357bf67d) (cherry picked from commit 3f622c51a70200bf67d209d0cec78db2f25b65db) (cherry picked from commit 84c62ad447a94ebd5d1906e41c29efd3a0816c70) (cherry picked from commit ba186c8ee40e95cd4f40b6205d673dfe20528825) (cherry picked from commit 4238ef291dffb68b350aa2f410e934d52cb0a1eb) (cherry picked from commit 3ef1bd61b9a45271e69c1529875e84b379073318) (cherry picked from commit f304086bb693d3a0a58871ba8cb1354ba290695c) (cherry picked from commit 64a2edabcb7bc9e3961ea45f83cf6488e4cd99f2) (cherry picked from commit 6accea6ba7f2b0f98b6bef5b1483ee39ad68edba) (cherry picked from commit 2296e93a42939af90dee718bc8ff691009238c47) (cherry picked from commit 2bf0be3b1bff62923dd04e1a02956ced1eda97af) (cherry picked from commit fb4652b197ec64280689e6d065492f916f7e26f3) (cherry picked from commit 7d462cf353ef87007025bbd76aebef429be10562) (cherry picked from commit f5319660ddecea208163b5bcd37444322e571b51) |
||
Gusted
|
f7f813ab84
|
[BRANDING] Replace branding in Swagger
- "Gitea" is automatically being determined in Swagger and cannot be overridden, therefor we override it after `swagger generate spec` is run. - Resolves https://codeberg.org/forgejo/forgejo/issues/226 (cherry picked from commit 0b453807656b6fbe54284d865e59880460f3d253) [BRANDING] Change Swagger title to Forgejo API (cherry picked from commit 79f6a70b53421be9984a9ad96ebd0d06ab5af02e) (cherry picked from commit 6cd47afe3366a615d40655a435275d5543910065) (cherry picked from commit a7ae2e4c09431cd7a1f18c5b87b9dd87981b538d) (cherry picked from commit 59f837e4661233dafc202ded9ad907dbdf7e3e69) (cherry picked from commit c1c3d1f0e63b880baa32d285d3eba6034137b45a) (cherry picked from commit 4b088713fb0a55c2c37f734ce82f13190ca412dd) (cherry picked from commit 3df1d2137112a95279a8c84a8601e4c137d75d4f) (cherry picked from commit a4a5fdbde4f9ebbf5ba6ba66c8f20a89e54860de) (cherry picked from commit 57aa9ed710a95aa51ae3824873c3766b38da7850) (cherry picked from commit 948b49bf9449af744a1f2e1324187897ed1c0809) (cherry picked from commit be4929ab6a802d7d748f537ab8b798e30588c1d4) (cherry picked from commit 9ecb507457d8a6aa60713762a1a5d2995ed986e5) Conflicts: templates/swagger/ui.tmpl (cherry picked from commit 8e57e688637b9fbd3c33d3e38aed8768a2c07208) (cherry picked from commit f0b3f621e34130c75b35c113ad509ab73118e123) (cherry picked from commit 5b0a6d093ea5210a5ba27705b1d1636e23da8738) (cherry picked from commit 2e0f6b5de8837a439ecadaf3434d006d7014016c) (cherry picked from commit bb08076f5c26481d78855823c2daa1a76d3865fb) (cherry picked from commit 5c9360e38a41a4494b1b1b247f9d57b1a0d91ef0) (cherry picked from commit 2f277561489e1228af163fa4e5d153ceb7eec864) (cherry picked from commit 6fce7eeb511d949249e045a995cc637d3788a1f0) (cherry picked from commit 8d27e7bebd961468bd492c4d64e132a46d97f62b) (cherry picked from commit fda2ee2aaedac8f394d9fc38085f768c775d2c38) (cherry picked from commit fe0489a4d856655fdcf93c16a41995709c47f78f) (cherry picked from commit fe9479b357d2ef0f5fd8247e8356ce7c75135b88) (cherry picked from commit 1deadb2f35c8c0c87cd93b6f04675312b1e667bb) (cherry picked from commit d1cb84b2f225c484755172735841e3b75abce409) (cherry picked from commit 9de15d49f8ff0ef0803e8b3a7437a45358e924b9) (cherry picked from commit 461fbe219c30de7e756ce2cb6dbc354417655a6f) (cherry picked from commit f39bf3ba5b6325898968533e79fdfc5fe74c3810) (cherry picked from commit b3f31c2f7bc5b4f5ed3f7fb6e6a6649331eb179a) (cherry picked from commit b9f493c139bc40bb5aaf361b813019968be75968) (cherry picked from commit 83781b16411d49f2f27b622ac3e806234b477984) (cherry picked from commit 4438ee0434f88fc0dcb917304a5baf5b8c2d11a8) (cherry picked from commit 56b6b368334fe3d11fb55b8e35bbfc314f45405a) (cherry picked from commit dde88ed2fda2403159e78f174357c5e993bce1de) (cherry picked from commit 96bb13ce5428dd88866c92cd4d9b4e216d7e544f) (cherry picked from commit aacc824826922e1a17be556dfbaf36667950a5aa) (cherry picked from commit 0db579b0b365e832b4722fb1a70906c77d384afc) (cherry picked from commit c1fd3777defb547c1aef01b95d7a0feba2258ad9) Conflicts: templates/swagger/v1_json.tmpl https://codeberg.org/forgejo/forgejo/pulls/1832 (cherry picked from commit 5c8a6e1ca883cc0ac65b25ff4fde2e5d52b274f4) (cherry picked from commit ff145b32c729ace3ed11bfbb5a7f1aba5454e999) (cherry picked from commit db9b904b84158c27b1c6004b9ca7f1f7f89066c7) (cherry picked from commit a79e2b2b560851c895c776e737bcf44336e0b31d) (cherry picked from commit a5830247dfece7ee3609bfe89050743d175d924e) (cherry picked from commit 9120bc461727f35062bd2bc8129f422f7e435a0f) (cherry picked from commit cd873945b26ed3008b75de52c8a829880d684126) (cherry picked from commit 6a48e3ea5be6cf818dbccd36611ec07406d6bd35) (cherry picked from commit 489c1ac8fbd87e3f23d91b829728f77e6aafe57c) (cherry picked from commit a1f7fd771eda03c8009f2844f35ea1fdcc4fd158) |
||
TomZ
|
743d1e34ac
|
[BRANDING] cosmetic s/Gitea/Forgejo/ in logs, messages, etc.
As the docs of codeberg refer to the strings printed by the Forgejo ssh servers, this is user-facing and is nice to update to the new product name. (cherry picked from commit 103991d73f0f78f31a5f1dae47824c2fe481bcc6) (cherry picked from commit 2a0d3f85f199d28a4180becdebcb90af0d6f3504) (cherry picked from commit eb2b4ce388810dc145dd90d3358d4d4373e31b80) (cherry picked from commit 0998b51716ef5d3c25e139886aa8b7bfde703b20) [BRANDING] forgejo log message (cherry picked from commit d51a046ebe774236f8b902c45486dc8cbd041e0e) (cherry picked from commit d66e1c7b6e2fbfefb976103805b18eb29b6406af) (cherry picked from commit b5bffe4ce8a8353c9e5529350a7932d4a2d9e53e) (cherry picked from commit 3fa776d8566c42ce31540024ce5bf5a6cb5cd4e4) (cherry picked from commit 18d064f47214327dc5b6c55c2d02a3da53358dbc) (cherry picked from commit c95094e355212d4baf607f3778152ceb455d4f82) (cherry picked from commit 5784290bc46afffca9b93e0faa3bd88944e54919) (cherry picked from commit aee336886b2606beaf8c27a2992c21aa2a574966) (cherry picked from commit ec2f60b516b1ee11b5e7c52ecb02fdf8e5bbcaec) (cherry picked from commit 7af742a28469d6725248d5519e69217b844ed792) (cherry picked from commit f279e2a264ae028ab511ba61a71e00739dc5020a) (cherry picked from commit fd38cfb14eebe34dc72b8358479e53d27fe01180) (cherry picked from commit 64c82266183943f062016479c2d1868ccdee2cec) (cherry picked from commit b546fb23042c6d231ce29241d1991c9cb1bf1bba) (cherry picked from commit ad102021776a8dd407ef19cbfadc42b3ca7fabd5) (cherry picked from commit c89cab9c2b019a592dffe4b6de29482feca1bb33) (cherry picked from commit 9579322ec2eec40cb8f113458c1d5669f5d4b818) (cherry picked from commit 16b44ad18de82b0429a8b0a05ed93445d1524241) (cherry picked from commit 2571ff703b77cc8527f37f82c36e9260a80ac673) (cherry picked from commit ad61d9ce9b93503b04deb9ecdb5f214566caf820) (cherry picked from commit 9b2c45d4d3b1c6401a3d7d0a5544213e1486ab9e) (cherry picked from commit ed01b79a598a0698324392dab66a2cd3d41c628c) (cherry picked from commit d040b664279292f9f7304f96db0d172672c1e904) (cherry picked from commit ffe0bbea48d036c26149d98856add938bb08a475) (cherry picked from commit 4c1b2c409bb90a0c2876f3a7323cf162a7e58765) (cherry picked from commit 3d8338ed106cb6260a4dae249ddef71489c47357) (cherry picked from commit a92f044ea96bbe9c47689455a417e4f1bc3cd648) [BRANDING] link to forgejo.org/docs instead of docs.gitea.io (cherry picked from commit 3efafd0e083eb331ce06681351a40c4f46d7c96f) (cherry picked from commit 148185e34b2be36fa46e8630928ee64a73768883) (cherry picked from commit 834e264698f710049f20491b91b3c39b853de867) (cherry picked from commit e72fa6eb1ef8f4355197ced3c619d8ff6d9c1c9f) [BRANDING] link to forgejo.org/docs instead of docs.gitea.io Fix the link that was 404. (cherry picked from commit ae515d7258602a0fe4bb4471f2017e4ccc7dd0e7) (cherry picked from commit facc2367f0e5fc1e1162cc2478a658f050c07718) (cherry picked from commit 25784b9f21a37d9161b050503b0d45d87cd8863d) (cherry picked from commit 2efc6138d92e958ee6a6091e579fa269aea45ce4) (cherry picked from commit b9d0871631ef70abe88de64ccbabcfc94a49274b) (cherry picked from commit f0446e51b9c2268f274a1c4b8c25abfcf417975c) (cherry picked from commit 1638aa67fb384bdcd97386861054447a8d53e832) (cherry picked from commit 290db6a018d4f82173446799b8726a320c209bb4) (cherry picked from commit 89b87cf5426b7407ba0e23912fbbd3c521a8bae4) (cherry picked from commit 656ed949625652a3a0e8d0b1381e76f75688e461) (cherry picked from commit 036f879f96d606af691326474cefe77441c8c4ed) (cherry picked from commit 69eea35f813d03f578ca143e45292289b0ad92a8) (cherry picked from commit b72e3f4a92a04ac065b5b72ca25f7eb0c96ba69d) (cherry picked from commit af606b8574d67c8c7a3699cf41d6a96fc3852547) (cherry picked from commit 7e47f8135c08be3f48ccad6b8d8a940bc5713e53) (cherry picked from commit 0e5218cc5374a0e16a273298f862dd3d6cebe020) (cherry picked from commit 7c2a20a528a6911412986ff8eb479f3a19d7f226) (cherry picked from commit 4e94006363227435b53769b92882b51a6109ba52) (cherry picked from commit e47cdfc43fb693dfd0507bb1fe943da41fd2ebb4) (cherry picked from commit 1dcb3e1da4ab4d8dbb659e87c4f542245b066409) (cherry picked from commit 67367c4e0f4b755879350e9311e44deff95c137c) (cherry picked from commit 252087d1ffcae00dfa7e8edc7face8775412d4cc) (cherry picked from commit f5977a43e5cb2c869af0cd8c993cd0d3eeccb622) Conflicts: templates/base/head_navbar.tmpl https://codeberg.org/forgejo/forgejo/pulls/1351 (cherry picked from commit 594938eb1505f6d81d8c0cce84a34c20a18b5c7a) (cherry picked from commit 0257d038a7416fd208571d8be0a14a9ea6ac4d95) (cherry picked from commit 72821dd14052505814df556e09a500981256f709) [BRANDING] s/gitea/forgejo/ in HTML placeholders Replaced Gitea branding with Forgejo for input placeholders Closes: #686 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/752 (cherry picked from commit 6160d37ca972566017aee46b2ef42f398f969dca) (cherry picked from commit df61138c7eaa25068fe0012644fd15b407a4816e) (cherry picked from commit 1f30566c3f63925ca56eaa21b4fa580b4bb1ffaf) (cherry picked from commit 539bb825f555585f0a52ea4c8747c5b589254633) (cherry picked from commit bee0f66c869d2632a1ad3cda731caaba74c3634c) (cherry picked from commit 60ad005c95a6d53f615a720445eef77e4bc499ef) (cherry picked from commit 282e26222ef4aea1720b4b121ac29264876069c7) (cherry picked from commit f9ca551f3dbc0f75250445b4e731396dc34fc041) (cherry picked from commit b2e04b04c381549557873b1956065dc5a5132a97) (cherry picked from commit c8f395a03c688bcc1413c6ed6b6f820aab7851d5) (cherry picked from commit 0d58ce49aeefd43b3316c0238dcd04e019b6be25) (cherry picked from commit c602ddf91efd95347de433cfad8ac20995d12283) (cherry picked from commit 029e37271ead5405daa11945bd64104f12c8ba77) (cherry picked from commit fdaa96b3ccca76cba877f8f5dafcf4cf9d160af8) (cherry picked from commit 515d99e27d5db12c5495e31e104ccb6b7ad0ce7a) (cherry picked from commit da73274ba1cb55d1c425b95890a55aecee2bb246) (cherry picked from commit ce90b696a01619d86ac7dac7b0cd78be8f06e4b1) (cherry picked from commit b6bf98763be1855b5613dc8db627fd889bff8308) (cherry picked from commit 5b380d22d78568c2c4f26a3e8aa90a42006969e9) [BRANDING] How to start a runner: URL to Actions admin documentation (cherry picked from commit da91799e6f06ac3c91c1cfc763f4ec0b5cc3cf21) (cherry picked from commit 28231663b634f6d877173ba4956f6c0a5d128b2b) (cherry picked from commit 533a90345bb0236c8fc088f2ab1b92535f8a4269) (cherry picked from commit 6a0e4e55dd02beff179b8503259d1cc774e8e81b) (cherry picked from commit f47cd611c68f9da2df9b0e5e0a8332f6fcc17932) (cherry picked from commit 001264b7840aaad6aa25e0b06a927300751ef20e) (cherry picked from commit e4099e9bb9f557e99bb0117eaf6ad88467684527) (cherry picked from commit 3a1885649ff1dcaf5acdb1bb237c477a92aeb01f) (cherry picked from commit c42802c710c0fce2eea06a93a7f4373557515616) (cherry picked from commit a611ce8d6d293573534d4ce1efde81d32129723a) (cherry picked from commit a3d7d10a80ba6104ee6f260290518936b210c16b) (cherry picked from commit 52adde671f8dcb309235506a3c39a38db87e9537) (cherry picked from commit c9a3820fef10ef0b20e52f5f70d7794dde0974b3) (cherry picked from commit dce40997c956244742325b5b10d13e8ec918082c) (cherry picked from commit 312a6b92f384fdb09fc26e5da5a4acf0680ff698) [BRANDING] package templates & links - Change Gitea to Forgejo where necessary. - Point all documentation to Forgejo's documentation. - Resolves #992 (cherry picked from commit d0b78a6edea0abba54ef537781234d8f778e0ad8) (cherry picked from commit e2382f30ba07586fd3ea4c8a535ab550ecc33408) (cherry picked from commit c41cf05a334944a66129425c4a9abb973fbb4687) (cherry picked from commit 797e598ae73441c66f25849bf643e0c11a737c41) (cherry picked from commit 970031a1c2974cf0c6ce057ad82afdd6380f6882) (cherry picked from commit 0c1180e2e142852248787185e2c01582413de8c3) Conflicts: templates/package/content/alpine.tmpl templates/package/content/cargo.tmpl templates/package/content/chef.tmpl templates/package/content/composer.tmpl templates/package/content/conan.tmpl templates/package/content/conda.tmpl templates/package/content/container.tmpl templates/package/content/cran.tmpl templates/package/content/debian.tmpl templates/package/content/generic.tmpl templates/package/content/go.tmpl templates/package/content/helm.tmpl templates/package/content/maven.tmpl templates/package/content/npm.tmpl templates/package/content/nuget.tmpl templates/package/content/pub.tmpl templates/package/content/pypi.tmpl templates/package/content/rpm.tmpl templates/package/content/rubygems.tmpl templates/package/content/swift.tmpl templates/package/content/vagrant.tmpl https://codeberg.org/forgejo/forgejo/pulls/1351 (cherry picked from commit 42ac9ff2abe55826047c36e041f1bcd70caf7581) (cherry picked from commit e390000bcee673c2d15c8777c2d2da316967ce62) (cherry picked from commit 56a437b29b71976b9b0816d0de2ce8169a84f288) Conflicts: templates/package/content/cargo.tmpl https://codeberg.org/forgejo/forgejo/pulls/1466 [BRANDING] s/Gitea/Forgejo/ in user visible help & comments - Modify the README of the docker directory to point to the relevant docker files and documentation for Forgejo. (cherry picked from commit aca6371215c1bf95b6c0b19b9fadb797544adc48) (cherry picked from commit 0ba96b1bc4c4df84ce3dca9875ad4a9ac8f1f759) (cherry picked from commit 5c8e6b53f164dd16b527c603a3089735ff16df89) Conflicts: docker/README.md https://codeberg.org/forgejo/forgejo/pulls/1351 (cherry picked from commit b3121c8004f675b31482cdbd564f9a830be48acd) (cherry picked from commit 607f8704163bd24bfc7ff1d6a812b5e887746797) (cherry picked from commit 191d96afe4198d3b6498aa21eaeb7686a59865bc) [BRANDING] healthcheck/check.go (cherry picked from commit d703a236cebadc0186b7b2431b3b42a54b3d1f09) (cherry picked from commit d84ce3ff2098e9ba3c7241605ea25951dcb57ca6) (cherry picked from commit 2dbb8446069c79017dcc4a9921dffcb73594d02c) (cherry picked from commit 14d3ae7e3ae67dff3443db17e4373e5947ed6c6c) [BRANDING] s/Gitea/Forgejo/g in CLI output (cherry picked from commit 7543c126bbb78d5d29c253a88b56ccd2dd394928) (cherry picked from commit b66f422fc3b9018aa948a869045cb3684e80f5f2) (cherry picked from commit a81e4e46f3b0e619cea959de5ffde2e811d6008e) [BRANDING] Gitea->Forgejo in mailer code (cherry picked from commit b91afea4ff5e092452b5848900fc426b1c7289d5) (cherry picked from commit 5d7428167c8ee5f25fb719f32a561472ef1aee68) (cherry picked from commit ed8101ba6cc87526554a69f58a49507a79eadb35) [BRANDING] use 'Forgejo' for Discord, Packagist, and Slack webhooks Refs: https://codeberg.org/forgejo/forgejo/issues/1387 (cherry picked from commit 7dc3a05f5b9013a0696f071ebea4d2403c1c36a8) (cherry picked from commit 133f2fc6cc2e977a5f7660ca4c214c92ac036421) [BRANDING] cmd/manager.go (cherry picked from commit d1dba2c79db63a6fc23e6bbab2b8dcbdaf43b679) [BRANDING] pyproject.toml (cherry picked from commit 7e8c868db2d5331778a87b5a1b493a81bf6863a4) (cherry picked from commit 2395995c8b61c0674278db4321aa7d79e4c0eb91) (cherry picked from commit dd6fbbf332f7833175634ef6d48eb5ad384aabb9) Conflicts: templates/package/content/cargo.tmpl https://codeberg.org/forgejo/forgejo/pulls/1548 (cherry picked from commit 6f9a5d5cabc9bf7b57dc199a332261b8fe53e52d) (cherry picked from commit d0635c4a07bb080e509f5578a995c7378b995691) (cherry picked from commit 5f9a8c5744d254099c7ce98f14e1b58ec0a40708) (cherry picked from commit 10b96c45673ef1d8d9f5364721b6e876a10e6f3b) (cherry picked from commit 717d52e92863aa44536ed7ad524608aa5f398469) (cherry picked from commit 5debdb103eb44d40fa9dd7056b48accc3cc185aa) (cherry picked from commit ded1c1700e3795abf1d95d4d732703b9148f68fd) (cherry picked from commit 52aa23cf7a3a7960c60ed7b504ea58c147a6c399) (cherry picked from commit 882c942b061ef6f8e65668c70349522b57893090) (cherry picked from commit 73fc2d2ea86877f9821a0230aa28114b624251fc) Conflicts: cmd/actions.go cmd/doctor.go cmd/keys.go https://codeberg.org/forgejo/forgejo/pulls/1976 (cherry picked from commit 6180ef24dc0edad0b7471c463715179f29d741b9) (cherry picked from commit 8970fa2bf872ee544ed9e0c1241fde8755e6acf1) Conflicts: templates/package/content/debian.tmpl https://codeberg.org/forgejo/forgejo/pulls/2074 Fix a typo in docker/README.md Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu> (cherry picked from commit 2e5df79dfb45719ff55c4c1f33bb1e753c32533f) (cherry picked from commit 2bf6ce5b8167da5f5245337de93bf01f8522bd49) (cherry picked from commit 8ec779277d6fbdbcc0a5f369fa73d47d3f80996f) (cherry picked from commit 6048fc66e8ed9820ecb84e025efe9affbf124d85) (cherry picked from commit 162538c722202d13f443b45249f05f3d9abd76f5) (cherry picked from commit 646bb9965088a028a4469796fa6d62e4499e2b0d) |
||
Caesar Schinas
|
42e81f8451
|
[BRANDING] Rebrand default meta tags
(cherry picked from commit b1a792b63547df1471a125c2384a9623ffae409e) (cherry picked from commit ba71acccdb8eb4d1c87b50708fe3b03a3324dd9c) (cherry picked from commit ef58efb8e0c48a782e01aac8d754e70b7611a2c8) (cherry picked from commit 6a1b08241ebb862bdd39c708852e3e23c4d96c9d) (cherry picked from commit 132c7a3a07d5a11b9b165295ef12111ce74aea70) (cherry picked from commit a1f07975d67ceccedc808ddaf657f8e7e0da74b1) (cherry picked from commit f3793598b24d00ca3ae80dbde4ef9909b298ca03) (cherry picked from commit 60f38116afc60b055c6b40be8a1e94f646252bf6) (cherry picked from commit 88884cf2833429749b9a6ec6110b4c4727304903) (cherry picked from commit 520de41aefa6c1f5c939b2345878697094962812) (cherry picked from commit cfd5e5b95ab081d10d4f5d6022d09db4877f51fc) (cherry picked from commit 5cf1738f0a08d99aba2016100f3f0083b51efcf4) (cherry picked from commit b95f9b3142089d90df93708638b2ae6c857dbc87) (cherry picked from commit 0118fba9703a1e3f9da6c7b5c479b8b919a5f5e2) (cherry picked from commit ef213ec79d8d0ae006bfda0b9e49d2da2be47ca3) (cherry picked from commit f6794f694b9fb262c66f8d3958dd5145c7ef0dbb) (cherry picked from commit 639110c03bc2d2f91fb6a5c619f1138a0522f836) (cherry picked from commit 2be6eca1e1c8488bdc9e6ce164dbd9f3d79771ce) (cherry picked from commit eb929d0d566b3dff8454e62ff9f2384a896fb549) (cherry picked from commit c49dd4ed7f771e8fa1573add6cbadc193a473ead) (cherry picked from commit 8ea074c4ddaa737c4faa83c1b4746dbd7cb84440) (cherry picked from commit 3145df43d60593700b60409a8d5ac12e4fbbc197) (cherry picked from commit d0df3e306a4f0a4f773c7cbc1409922fe69973aa) (cherry picked from commit 8f4850705eb4e016ebebc738f629bcc9ce87ca61) (cherry picked from commit 5a24d4319cf7ac2e56b9e43e4181b066d76d6d8d) (cherry picked from commit 756c04c6c46a55852089711f7859f533b85fd042) (cherry picked from commit ea627e79e36d0bc7514b28e6b7d5847b5bdf5922) (cherry picked from commit c52b141902ef0be06c100f4a1285f28419e6f497) (cherry picked from commit 49ab0c55597dc12a50be39a2bd35cb870ba8e361) (cherry picked from commit f14f26c940abd341ae6bd8e20e93bd736e907b52) (cherry picked from commit 4caebbb6becb26732f4d72d3e73a71ea821edf8f) (cherry picked from commit 7c3d0bca9e8868529e4496b6b17fbe1c0736c425) (cherry picked from commit 171a207006f82d5dfed4abb9c957a837a8aa53ba) (cherry picked from commit 2a4a7d05fbcc67f603f81c5a4adab016dccf7460) (cherry picked from commit 94b1b902053922ec73213f9c20f1a37a292959b8) (cherry picked from commit cd3565dbed2c86ef9c2d5e6b92931481b17e62c9) (cherry picked from commit 5d02758b22717ec93b9bf36af6d09bc66925e6a8) (cherry picked from commit 5901edd1114dc7a0a1f4d943bd3ba645ab4d0d22) (cherry picked from commit 8a3abe6dafafd5a8a05b3b37551082ce2a948b90) (cherry picked from commit eaa1a3e6ca6a4c178944e6d25a0819478c60d96d) (cherry picked from commit 7191d0abc48c464cafba209a1a5c3b762a4918d8) (cherry picked from commit 579b985d791182c20754293151b8829d95837ae9) (cherry picked from commit 16d7dbed870b69cf2e09c19fb16ad9cea0cce76a) (cherry picked from commit c1fa9edc159596e470daf28571e356295695396d) (cherry picked from commit cdcf37ff1b726b9f3e240935c19dc30160b47eba) (cherry picked from commit b0c78efb8656006239c22f330a63341ac99eb783) (cherry picked from commit dca8fb6cf7f8066bc30ab4df8eb277f3b6d7ef53) (cherry picked from commit 4d08cf9f2e48b1c5dfe88f3c596c7d305f2e2194) (cherry picked from commit 73be848222608347293e2b9487ae959c2adb077c) |
||
Caesar Schinas
|
b5976d4243
|
[BRANDING] Add Forgejo light, dark, and auto themes
(cherry picked from commit faab0c670e22588bc643d71b650560c2ccca2c8e) (cherry picked from commit b6d59493c7fa0bfa62095abb99c5c5a29bcf1659) (cherry picked from commit 837da0c1f41b40853eb4aebc40af16433cf7a9c2) (cherry picked from commit 71ad245e1d6f7f5b002c1c5e9831e872d157f906) (cherry picked from commit 85a7032f1b1c0d80e3d3960e9d902e9e66e687a5) Conflicts: web_src/css/themes/theme-forgejo-auto.less web_src/css/themes/theme-forgejo-dark.less web_src/css/themes/theme-forgejo-light.less web_src/less/_home.less see https://codeberg.org/forgejo/forgejo/pulls/552 (cherry picked from commit 0c2c131bb06024fca7d5c8ef6a2696d5f6aa4a1b) [BRANDING] Add Forgejo light, dark, and auto themes: fix import Closes: https://codeberg.org/forgejo/forgejo/issues/562 (cherry picked from commit 2b0dc1f80ff18d1c94df74c77a80e3651e7cb2ed) (cherry picked from commit 494ad6a3b7cd3328c835e6c7c76a55a77d47a60d) (cherry picked from commit 6940fc22c4917e86b25cf3c6c2ead9057ae726d4) (cherry picked from commit bd6f00656c457339ef3d08612911594358a15f14) (cherry picked from commit ebb506a1247751b1182348b281089dc00a65c741) (cherry picked from commit 43d72d37811c8b9d00b1d046341401643f66b289) (cherry picked from commit 1a87adca018545f6d2db0dad9e5d7cb59f6a97b8) (cherry picked from commit 0704c410b4e8a0b610e82f6ebe9209fb485ee722) (cherry picked from commit 9039b47c160e7fce2bd75167a0358eb7e7458e2d) (cherry picked from commit e32bb7892481a80156163dbf5063da0c8ead27d4) (cherry picked from commit 053ad84f91f994f96f4d9d037ff37e25b468c424) (cherry picked from commit a35f1b6da7a061a3d0717548d8f4e0972e7bb0ec) (cherry picked from commit 8cb94c01d5bcd453938924ce6c6a6804ce9ec255) [BRANDING] fix invisible label in branch protection settings (cherry picked from commit 23e5d457219a68f49938395b5532231ce4ac0022) (cherry picked from commit f02e4582e51a6a2eba93ddd599b7ea3679388e55) [BRANDING] Fix commit label for Forgejo Dark theme (#843) - Define the `--color-label-text` variable with a light color, which is currently used for commit's SHA Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/843 (cherry picked from commit 74c186a3806e37fcca8087ad79ba7c1f8e0d559e) (cherry picked from commit 7e185c5ca5298fad12fcc78b504d96163e71ad71) [BRANDING] Add Forgejo light, dark, and auto themes (squash) variables Adapt to |
||
1a673c0ff6
|
[BRANDING] container images: set APP_NAME
(cherry picked from commit 12d7bc447edb272327200389c73bb04bb5fccc14) (cherry picked from commit 1335b17fc35b8b873b94435fddcc23c5cdf0117e) (cherry picked from commit 0d7da06c47ac3a7278602871b95234f823e11f1d) (cherry picked from commit 095c1ab679bce39dbaa89e8a86eaeab8a9b823ad) (cherry picked from commit 2220f00d09e2692d10e0d07f1e8ae2232a636a7d) (cherry picked from commit f0be8bbdbfb758fd13f2f9325358ad292f6c030c) (cherry picked from commit 15188180a15adb58bbde418018612561b68b6927) (cherry picked from commit 96c471d7d36a24824835b254bf785689f898d715) (cherry picked from commit 709052f1e79bbb0ee417f8001c9c0dbd03e78791) (cherry picked from commit 98cd2f5deee05ae9be67250c85fc17e31eaaf28a) (cherry picked from commit a1014654b13e338eaf35cd96d6115fe88459480f) (cherry picked from commit a16f4dc51dce3f9d22cf899186fc61931a82f35e) (cherry picked from commit abbed33d1699daa99620acdec5322846f562cb8d) (cherry picked from commit 4871447def0794027227280059bdfa29cacc0a23) (cherry picked from commit ea1218b237017fa3ca3e5204afd56a18e8336650) (cherry picked from commit 6dd67d60de567e70a36524db940b8e88420251c0) (cherry picked from commit 71761f04afff6d1552c5604fcf7f9b5a27cf01ba) (cherry picked from commit 7cb28a3a06b1b665a6ac9d2687c79ef5ceed0dba) (cherry picked from commit d116336cb5a2df68260fbec42b606fa35c27ba30) (cherry picked from commit 4138a698b2744f504cc6e3590ab8b14753cb719d) (cherry picked from commit 38c572bc1928fc138503a88b66aa8e6d1c06aa6e) (cherry picked from commit 94c759b47f93dde23473d45eff2309dce5055d8a) (cherry picked from commit e1f52bf1d5087df6c7905afc08a7cbada6854f7f) (cherry picked from commit 8bc7000cfa7d0caa87f99c07543f36925fbe984b) (cherry picked from commit fa60007c3464a8d7fc278df1f6d51fb40c6ed130) (cherry picked from commit 0328db39c9a9359046aea0a422002a3072509345) (cherry picked from commit d028010b64e9d12dc3698fadd8b6f017ea2762ef) (cherry picked from commit 0283c920f01e8ec599613f8e28fa39157f698e4c) (cherry picked from commit f5bdf3e11f93c508d03ce38d66550aadeb41abdd) (cherry picked from commit e3beb523007fe87951a4e901596aaef965de0771) (cherry picked from commit a63d5afc91a5c7f29969c5ed722c6718c1452e6d) (cherry picked from commit 7d43e1a828139d20b5baafe1df706e11ed4d83a8) (cherry picked from commit a551fbd0fa00231a886c101d5fe438b184c01b93) (cherry picked from commit cdff0ddbb67237638d60ed5a6180670813ce24d0) (cherry picked from commit f2462ab1d0d0bf70c9d6cec4408bb6f9a05a6019) (cherry picked from commit 7231dcc0a7a16b8f1dc6a5a67e589cdf9ee310ed) (cherry picked from commit 1cbe55f8329f5ec70aaef39d6c66551f555e0b96) (cherry picked from commit 483d9534989bb6abdc65d87eed1f4806ea78f6eb) (cherry picked from commit e0b863d2e9b983c77a63199a14c50e1724688c1e) (cherry picked from commit 34dc719b4d55e87832f7dd38152d8503a9438ec0) (cherry picked from commit 200f1ddec3129f8722265531817bf4489ef02f6e) (cherry picked from commit 892435f00f6b22fa41bc572d58e1f3168677d3d2) (cherry picked from commit 188d1d387a933812a88e58241ac8fe3ceb1a1d36) (cherry picked from commit 8589533bfebf21233ca91a4b90d41532e34efad2) (cherry picked from commit 8e7e83ffe59044e67f954f20bce3a5be901e7777) (cherry picked from commit 4f86171d68d6a363d7c813cd8eb439ed656d3c6d) (cherry picked from commit ece61fd4f649e48e14811ffc2e20deae487244b8) (cherry picked from commit ff34eb0023be8e07e37cf63787bfc7187f9da3a6) (cherry picked from commit 845b0ecc8cbea1a7985b7623c92237f1bbf5710c) |
|||
Caesar Schinas
|
f0835feaff
|
[BRANDING] Custom loading animation for Forgejo
(cherry picked from commit a3b3b8a2dfb31f3b8000f1bfeae63ef3190c211f) (cherry picked from commit de0fd2d2e459aec24dae1293cc1f8f04069dedac) (cherry picked from commit e1bf4de211a92a2f4645b3f34039749456a10ea3) (cherry picked from commit 60ffc88a47a158fe4920f05875ea8d156eecaa70) (cherry picked from commit 7d2beea9ca4b47a29a1737b3a4d1d5486f2db1d3) (cherry picked from commit 171eadb95225183b3c1a1dfd3a5181953868b7d2) (cherry picked from commit 5e81f75ed2541fafb72d20911fa1db01154f8ff9) Conflicts: templates/install.tmpl templates/post-install.tmpl templates/repo/migrate/migrating.tmpl (cherry picked from commit 641c4a36c5c576d92d3dca952130542496c8c07f) (cherry picked from commit f1dbb2dcff94bcd734309c55808470d29f497577) (cherry picked from commit b66de5e5316b09eeaf6c3463542994293f7b2995) (cherry picked from commit eeccdf21a11e13f796caa45c206c89d9c273bc6b) (cherry picked from commit af37663f4d12aec35ee42769468e1e733a8bd4a0) (cherry picked from commit ed3739dccbfdacb6e0c8408ff6a26fcac20f8eb4) (cherry picked from commit f0036e37cf4f6e4402e2fbbe42763553399b51a8) (cherry picked from commit 90d453898a5c6481b9b2b6fe356f0a7b3ad2eafc) (cherry picked from commit c01154323832c57af7a84cadc4580a00bcc96e5e) (cherry picked from commit a294f34165c4df7100589dd2b44baf60af9d14b3) (cherry picked from commit cc00759140bc6bf3f68129ab97995c3bf01db276) (cherry picked from commit abe6d83b85759a80d82d52faacd36e8f315d5777) (cherry picked from commit 274d2863398cbb94f075a7532152eb9a090b504d) (cherry picked from commit 594aaf3c95e9cf671d02a81195653e0dabb1cae9) (cherry picked from commit 6059a376f48d96dccfaf99ff1eede2d4ba38afc5) (cherry picked from commit 676eb49a123694beba3bed8c0f00608f80b6b03b) (cherry picked from commit fc834fdb86e3678c3092d0e64be6ca2e0adb3a54) (cherry picked from commit e1e89a43495612c4e9a2e57c717c2996f1ad8cce) (cherry picked from commit 89e0d29cdb9ca413e0e31062997b9276482e5294) (cherry picked from commit eb7fc7a27eaf7e32d53228b660dfb98049f89b4d) (cherry picked from commit caa41ff62928df3b032234a945277bddb3c70f4f) (cherry picked from commit a74b6adb6ae77332638fcc8325072e82ae7f0a2c) (cherry picked from commit 4fc629b0d4c9fbc3f5933e4d5111dc67af59b393) (cherry picked from commit 66a3fb5dcdb74c5b4d61f9aa80d14517744776f2) (cherry picked from commit b26ec6315aa8c5ba2971affa2ac7d78fcfa4a9f4) (cherry picked from commit 8d9d4d6f6baaa0974455949aa6f122b02062ff89) (cherry picked from commit aa8e8666569fbf3993258568430d0b8d7ea318a3) (cherry picked from commit 78a3b95bda479bccbc1b87e9f9e3c80af5ec7e00) (cherry picked from commit bdeff07606ecec81be1276b87d9608ac1bf479c7) (cherry picked from commit 47ffb47822c1e45069733b71f16b2bd1bab137b3) (cherry picked from commit fa7dc92f2a5361c38ee7007e433d1abafdeb36d6) (cherry picked from commit 2a7c8466a7ffc02c74204fc01e5918d364490e3b) (cherry picked from commit e940e6c6a440d77d8e56ccdd7aa7cdafb24e5364) (cherry picked from commit b3504e37906b41b89351e5a487fc1bf678c68678) (cherry picked from commit 7cc5646dcc44ba64c5f05b9eea1c816b20f4322c) (cherry picked from commit 5116eb2c6626f5a269e01bf20603e6aa0b55902c) (cherry picked from commit 5ede0a190fc7007a60b747e26185679af1af58be) (cherry picked from commit 0263de4160814efe080da4b7c33f037f1a40f993) (cherry picked from commit 61e100f9039d82a0ec9b98c5f6acb020f9c97c55) (cherry picked from commit 4a3967a2891b4858455a4a77fb9b1d9aeb3c1dce) (cherry picked from commit f43115c5cbbe81007e012bc529cf5b28a42d969d) (cherry picked from commit f8ced210447bf2638729a4a0592007a4c6d1fde8) |
||
Caesar Schinas
|
95c371d1bb
|
[BRANDING] Rebrand default config settings for new installs (#140)
Replaces `Gitea` with `Forgejo` in the default config settings for new installs. This will not affect existing installs. Co-authored-by: Caesar Schinas <caesar@caesarschinas.com> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/140 Co-authored-by: Caesar Schinas <caesar@noreply.codeberg.org> Co-committed-by: Caesar Schinas <caesar@noreply.codeberg.org> (cherry picked from commit ca1319aa16128516e50dabdc8e8cadc23eb71d2f) (cherry picked from commit 52a4d238a0b5bbea28b28e55e35f28c51ecbb2de) (cherry picked from commit f63536538cfe4b010ebb5a6323f4b5e5b6ec7232) Conflicts: web_src/js/features/install.js (cherry picked from commit 861cc434e129f3fbd932ee36067c560e754dab9a) (cherry picked from commit 0e6ea60c802d6cfd95dea4aad5df96bb6e4bc7a5) (cherry picked from commit 0cbc0ec15d9d952b0ecfb68a36bf58cbae0c43dd) (cherry picked from commit 3cc19b0ae214ae163f23efa52ab0aa53eb7c935b) (cherry picked from commit 50fcb885fe2f87a27e6ff778cdd0c7cd97bbe9e9) (cherry picked from commit f6039d4df481fc58b8db3e863158665d24cac847) (cherry picked from commit 5ae5c6ba2deefe829f768900f5e1bbcbe9389e15) (cherry picked from commit f0b565e0ed7fe52f0264e92c49736b487b9bff8a) (cherry picked from commit adbd4d2015e8e2c4789849c84cfa4032acd40b7f) (cherry picked from commit d26c540ffdbfb7ec83412635576ab39653d1b531) (cherry picked from commit 6df6781b42ea126d029ba9e85485dbcb9bf6601d) (cherry picked from commit b6fb56e1c407195bedfe09f91ecb6537024d5189) (cherry picked from commit bb4f98a0ca7515aa6c44529df0573195f779a643) (cherry picked from commit 6779229f2732f6791aba3bd1ba51a338a88ca1f3) (cherry picked from commit c216c85aee552aa15e9d6316002ee9e170de64d7) (cherry picked from commit dff780bced1dc78ddd7fa4952766969ee528c538) (cherry picked from commit 4e036aa3b6d1bc5f2041c3b30ec289cb082fe824) (cherry picked from commit 8b3bc3e8a64edaba64cb759ea31248eea7307937) (cherry picked from commit 1e4d8523321efaf6c5febdd77ba5150effe5c1ac) (cherry picked from commit 07a15d18447bb03bb04001f1f65305670d1467ef) (cherry picked from commit fb44b3e10d685dd180f37678a3e2a64ee641f2b2) (cherry picked from commit b212d833190ce59230b3fc288c1aac5106cf33a0) (cherry picked from commit 5754971be5c37e97f3165878af3760117e40af01) (cherry picked from commit 0c43b4e82cab028fae1b709c549251d63a3ffc04) Conflicts: routers/install/install.go https://codeberg.org/forgejo/forgejo/pulls/1351 (cherry picked from commit 2e22a7208a0f149afc3794425c7b5b2b0181a939) (cherry picked from commit 676b0a8a48f99d751b677b9eca5b57238b5003a5) (cherry picked from commit bc4a8bf9bcb75e92b7802c477b1bb14a047344a6) (cherry picked from commit 5e09a4e174cc6d62b08fa718d0309275effadbd8) (cherry picked from commit 712c52a32a3b6ce9aafaefaf9e63729522d1e0c5) (cherry picked from commit ba3d93cc4a5dca5d0daef647fab557e0136925e2) (cherry picked from commit a5a0396abc512834ca7b0b247277e4d753a87659) (cherry picked from commit 09b205f30b17b8f22688f39b5f98d06b44745a4b) (cherry picked from commit 52b7729e86aade4faa9577abb53401a4040131f0) (cherry picked from commit bfe78735e84312bccb8adb402041830da93ba646) (cherry picked from commit 915c4f7a7b1e20ba4299a8631c873c7aed288992) (cherry picked from commit 3b1af856bbc604511bdd42eda65dbf0808a12abc) (cherry picked from commit ffe2c0a3535fa510ba416d12324d00406678075e) (cherry picked from commit fd5cc72128272572a84b011f67a05999e60e931a) (cherry picked from commit 95d3555e47cdca47e603692e669ebbdc024dc6d3) (cherry picked from commit b9b853f4b0a9a0587a1b2fce7c63bb315aba0af2) (cherry picked from commit 967453eb6f5776d65883797dd9ad24b57eecbbd3) (cherry picked from commit 3298f502dda8570884494e557df5800ba0f2150f) (cherry picked from commit 3481d1f816fe87db000cde4ef1e6d952c520efcf) (cherry picked from commit 7508c24a0c6d44f98ff1ccb96285309e640b16bb) (cherry picked from commit 54e97f7c35bbb1800defdfdf99934f22505c0c4d) (cherry picked from commit 492876992f59c597882c69fef6880d7981e33046) |
||
Caesar Schinas
|
e5b68d2614
|
[BRANDING] Add forgejo emoji
(cherry picked from commit ade55ad308ea0ac6bb36903e3a69b02d18228adb) (cherry picked from commit 107f7266183584b51299351961b73ab2b185f24b) (cherry picked from commit f29cf9cfc107692cd79a4ba4062a66f90813bc4e) (cherry picked from commit 0761a41eee30a32c822834ca2b989ad6343ed1e0) (cherry picked from commit 2b1fd9565f615dde8bdd07d86ff3a5ca3815af67) (cherry picked from commit 6a7c82f13b17df1fa647130d086fbcdbeb086571) (cherry picked from commit 4a56d404942562e3f5a45abd45518bc8679109b6) (cherry picked from commit b48e3e896d0d3942362b5a1c18f847ffd64609cb) (cherry picked from commit bde83340cbcce8370d524da9c909731c78544c49) (cherry picked from commit 74e0603d6be22d8d74d38f9c99c8bcf26dd83482) (cherry picked from commit 84bd1ddc082aa55a7d7c03eeac55478f0e15e019) (cherry picked from commit 62d9acde2a0692f46257dc3db329e0196b74837a) (cherry picked from commit 5b84a909135a4d71c778a2d0719a20ff01abef64) (cherry picked from commit 5362f7d053f4e8bd6a91d93ddbcb6d291a250efe) (cherry picked from commit 65ad7d1bd9875b6dd00f3ef31bc1d5ef2b9e84f5) (cherry picked from commit 6e42d545a97ef7d470b57f6ae43ae15fa1581a37) (cherry picked from commit 24d3bb33e2031a44c535602a7a083194acacbff1) (cherry picked from commit 704935cadd997dcc1dea5e51a089ed25ec1ccab1) (cherry picked from commit 5d9fc59e17c9be563432376c3b7d1851300ccdac) (cherry picked from commit 4c95df3f86f9e778a9d1267cdca22c4ce15ffb94) (cherry picked from commit 1ac704762ac78ba2a86a787f02de45779d765673) (cherry picked from commit 0da9fb13189b0bff21a734c0f635ec196731a91f) (cherry picked from commit bc2de51eeffea7fb4c5b53e7a72cab315af8215a) (cherry picked from commit ea897a20b91e89be48570ca923dcbea1b4baf81e) (cherry picked from commit 66f3f9c6effd19ca6762437e7756bd3ac564a6f3) (cherry picked from commit edc5c3c3043867ea01b93f50ca83014592ef89b6) (cherry picked from commit 11dd4f31a49b5448d4207c928df6be647adf5ce0) (cherry picked from commit bf0fb77afb91dfff7ba81a59bbf5506a6b0a6462) (cherry picked from commit 3a823b1001817b906c31453ff86d43ebe6bf9719) (cherry picked from commit e1f6cb4ed607f17da4bedf36fe60af9d4a492089) (cherry picked from commit 0b3f45972ff338a00ca084b1c3371714fc1b7011) (cherry picked from commit a9579c967946436338e44d323db2303f108dbf69) (cherry picked from commit 0dea1aadf25e120ee1f19ffa6f15caa285ad3c7b) (cherry picked from commit aeed23b96ee384054068633cb3bae71893d9382c) (cherry picked from commit 72712f467df8de65955f15457c5845b80c2925e1) (cherry picked from commit b49b832899b24efc73bbe7f1d7ed3626e5b55434) (cherry picked from commit a985bb8b902ddcc98d24e6f3078b1e1fee61a1c7) (cherry picked from commit dac4d692182eb96701c46451f6d5a22966494583) (cherry picked from commit 4962eb361dea6528b6d36d29e1c27d8e76351ec9) (cherry picked from commit 61835639c8134b017ee8cf1816315c1536eeedcc) (cherry picked from commit f4e44e3b602bda4c11150bea1e0e56f75f751398) (cherry picked from commit 65c5f553c1cd9890de0eae416820dae84ad412a6) Conflicts: modules/setting/ui.go https://codeberg.org/forgejo/forgejo/pulls/1976 (cherry picked from commit ef2f0c1c4a00e23579829ee874f80af2a9423c39) (cherry picked from commit 4c208ef65e9dd65c772d981f165305f2ebd436b2) (cherry picked from commit 3386a9d6ee8ea4e42faa3d9f1879de66f7f44d39) Conflicts: modules/setting/ui.go https://codeberg.org/forgejo/forgejo/pulls/2116 (cherry picked from commit 8f93b38c6636e85151d79647050e8731f0cb07a9) (cherry picked from commit af49467e83c073de9d8613facfc833d0912945ef) (cherry picked from commit edef259a3863128359e826e73901bae149e30c28) (cherry picked from commit a46b5bbf389e42cba0b49446302959ddd92922da) |
||
Caesar Schinas
|
f9638e435b
|
[BRANDING] Rebrand footer "powered by" links
(cherry picked from commit 8b9237e47e067db4cb8b1d477865d75b258bee1e) (cherry picked from commit 47e5543f33a9dafac5517cb5cb29d0fe6d266e2a) (cherry picked from commit 456abff8c0567168b1a6c0d02d6830404d1b0dd3) (cherry picked from commit 2d2588187ec20cb2f552cd3ee2b04a541909dc5c) (cherry picked from commit a81e4e2588af2d1e9db253ca51649451d8dd94cf) (cherry picked from commit 70c4ee8fbad69efcc02493ab8e1c692573ac0409) (cherry picked from commit f12b0577e89ae223dc239c7ace5c692d30cd0e9b) (cherry picked from commit 025e6e1974c8066c27e918020a6094fc8372f521) (cherry picked from commit e051684c83e369177d22a77bff46e82998495267) (cherry picked from commit ee370f3f3cf5ec81e170fc16c8ef982b47c99797) (cherry picked from commit a1b53a8b883559a31b16a15a383ac5fe25a62189) (cherry picked from commit e01158af9b037cff4248b0b577505023c9564b7e) (cherry picked from commit c9f6b6c8a18b39e804e8464dfc80178af3efdada) (cherry picked from commit 6abaa468d5cc1ae7f59b9026f4221b15911f3ba1) (cherry picked from commit d039148bc83d6957435f2d3fd00b5f18c9af99e2) (cherry picked from commit d3aadcac8bf4e136bb16e86702831cbcb6e6692f) (cherry picked from commit e739f46aaef7d162bf42f152b665349e25aadc1b) (cherry picked from commit 228671e72353a1366488cd28406478ee866f823f) (cherry picked from commit 8965f9bdf248dfb80b80269d565ff17e8437a411) (cherry picked from commit 5e97896da347dcfb592eb0bcef172652f43fed90) (cherry picked from commit df8bdce12a1ef0d4578fca2b55d30c9f981feabb) (cherry picked from commit 33ecf86e423c4481cb34de4a2c6d743602631891) (cherry picked from commit 038ac822db5be6ad65f09050bb60cb0f2afffe66) (cherry picked from commit 6decbafd3a3d53f9dc9ae58da302968b31aca32a) (cherry picked from commit ad2b719be5629bf4ed544666a294a2f5c040da92) (cherry picked from commit d9b2f11a7b778b71f06f0256ccba188dee445f79) (cherry picked from commit 102033346275114f8de5f682749bda125c15a769) (cherry picked from commit c1279c7d45fe91cae6e88c143280601e9b866bee) (cherry picked from commit a0dfccbba42b498aa4024956eedcb3de12ed2db5) Conflicts: templates/base/footer_content.tmpl https://codeberg.org/forgejo/forgejo/pulls/1420 (cherry picked from commit 9651bcf9c6c81451b6e2fdb736f3f6c1e133afe1) (cherry picked from commit 73cd49d3e52de053e852599efdc677dca04a94fb) (cherry picked from commit c4778ed2ec654001b3d579c73fa2dc791d87bf34) (cherry picked from commit ca0bd91ab75371fbbd1c5b871bafd163221ae182) (cherry picked from commit e3720f5b138d423322c925d6b74bf3e62858239b) (cherry picked from commit 6ec65da832edf8aed99e216a6dde07d477f5076f) (cherry picked from commit 157cf1d92943b72ff7ab1df8b7293696f957924e) (cherry picked from commit 1956c751b02fe9c9bf08bd9de88e412397f788d1) (cherry picked from commit dae4f61afa240d1a391a47236330f99cafabd754) (cherry picked from commit 65b13516e088640a5c4318945e0a03b0f3e7ccd7) (cherry picked from commit eab31d418a38c04b2003d43c3ce7430bff03c484) (cherry picked from commit 53811a64555e7e23f5bc3590d9c1292acde8cb51) (cherry picked from commit cd201222d7315a29b960b74a72924998f6510ee9) (cherry picked from commit 01d522eba592b3e6beffbe29c49399f3feff1cc5) (cherry picked from commit f319eabc923238c72c2bb65fd1a261cdb646acf1) (cherry picked from commit ef85ae5aff733823c0daa238b5ffa646589745d8) (cherry picked from commit 5c259c00180c6a3f6378b48c2e70c34604eb6d7a) (cherry picked from commit 08edee9ed1baccde69edec604cf7a36bdde903e1) (cherry picked from commit b08d13df89aaca49296a29e5d95660adea652260) (cherry picked from commit b1d0fedc76799284c26d6113798803330580dde5) |
||
Gusted
|
674c579879
|
[BRANDING] Rebrand systemd service (#137)
- We can rebrand this quite safely, as only new installations would likely look into this file and configure the correct folders(to use forgejo instead of gitea). Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/137 (cherry picked from commit fa78e52b5d25556b4a4313c4ac78edf6306c5bbe) (cherry picked from commit e36d649989a69a1761c3d7cc709f97f80c8d378a) (cherry picked from commit 37e15a2f4108c4b7e082a69fb8cb77068fa6dc15) (cherry picked from commit a09a4b3ce0b6f63ac44bf4ea0f4ba275a9915598) (cherry picked from commit 3096b37c950db77296f22d16d64efe3737246a4b) (cherry picked from commit 187ad96c94b7fbc261c88a4ff513066acc562642) (cherry picked from commit e15eb31c6e6310d14175cc270707d7cbfb95b819) (cherry picked from commit e276abe3410cef5fe63bf05c6f089ed4a3da49dc) (cherry picked from commit 31223db5e3290ccf67a504db1937e5adb903b204) (cherry picked from commit 8ebffe0b71db27b40f2049ca77878748e6756ec1) (cherry picked from commit 1d198363469814584c50e4717a7f96cafb06aa46) (cherry picked from commit baaf749ce07f978466d6c397c1ed6bb6a1c75330) Conflicts: contrib/systemd/forgejo.service (cherry picked from commit c309b1a1f4fa2942218352a6ec3edbf39efb9a11) (cherry picked from commit d6f57409dacf2645cd19bcd8a79219a9a8c1bffe) (cherry picked from commit c6e665b0380f1d70c8c378b65c369a85eab9664c) (cherry picked from commit 8764e26c434ec8027acaaabdf65e3122e5965178) (cherry picked from commit a0560e454b4d5d7dac357a95dbaeb2b187a173ff) (cherry picked from commit e074e83094866421f94cb3cef912794a31b88c82) (cherry picked from commit 605b84bc779d41deac03595c8ddb7fa12b2b24e8) (cherry picked from commit 35b233202058e219dec5acfc72ff0d7085a41318) (cherry picked from commit b9c396f29566ec064a7c4031d4f766a25594eba4) (cherry picked from commit 83a7e91bad1d99092c8c553ce740c65256901abb) (cherry picked from commit 3794ad271a40bb4212cb14e24a6100b539d3a776) (cherry picked from commit 818451287d166658f6ce18892a6ed9811324aa67) (cherry picked from commit ec9bc9e6417fd7df3e636c231fb80a3442972542) (cherry picked from commit 8434efaed8637351f6fe53c01dd4fb3edf09fce1) (cherry picked from commit 3b1a4b7f389e7548f94d2d1b742de086aa77bfc6) (cherry picked from commit c186b5a3e51c24f795967dc4811d89ed0b841b24) (cherry picked from commit e35d92de1f37bea0a593093678f093845955e3fc) (cherry picked from commit c8bb51718360d1e90716c5c6253c55a6d7817a7e) (cherry picked from commit 9ac843d662122c5585a53a1aa9df1662adecb41f) (cherry picked from commit 86c723ca0a1b68ee204188cc45977d78ab7d8c7c) (cherry picked from commit c662da2a84e2266e571cea91cdedcf1a9906cd1a) (cherry picked from commit 6f9390ed438fbae94698f56be1f98a63c88241c1) (cherry picked from commit 684f80f7cebce8d0942ca892557d1890a19c8d4f) (cherry picked from commit 0e28b2a57fd88d8e2df245cc4740b56e72fed9c9) (cherry picked from commit ded78839e42f5ef92ec685fe8e81ddf4e0839d32) (cherry picked from commit 33720ba9554cdae8e6f0d7891145b81eb105c3b3) (cherry picked from commit b39b88fd01deb34b40c489f393d67873fb5d758f) (cherry picked from commit 666ae3c7b21f69877c8c7fe7b17a188a5068aa04) (cherry picked from commit ac968a29b3e5a3c346e77271b80a4aa3664bec12) (cherry picked from commit 72d83381f366e63bf66066119c7a668558d75739) (cherry picked from commit bb73be008bc73d6e1b16cd6c62f0b287ff8ed204) (cherry picked from commit 8c38bbe481b2f0ccd0c5185f6ffaa02b8b6993b2) (cherry picked from commit 9e4ff9a3dfd0420e8f7ad9cd3dbbd5144fa55aac) Conflicts: contrib/systemd/forgejo.service https://codeberg.org/forgejo/forgejo/pulls/2116 (cherry picked from commit 3a878dbefee46b1dd7ef96418c2e585a169cade1) (cherry picked from commit 63d014f13ccdb9a9bd547a1f02f07845a1fcb6a8) (cherry picked from commit d231e454a57d5d0e6fdb0a6075172292a6770905) (cherry picked from commit 0996e3a9c97ea858a9238a5f42cd2ea3da7c5ebe) |
||
Caesar Schinas
|
31bfb80c03
|
[BRANDING] add Forgejo logo
(cherry picked from commit f42622c7d5a28859f535e0d86ece06101baad1ef) (cherry picked from commit a39e7f2a79f6527d45439f21bd88378264160c3a) (cherry picked from commit afa2a31bb99c0fd9cd25c3c0279e6c49695b1900) (cherry picked from commit 276e8856e594ad7e73414382d34fdf0278cbca6a) (cherry picked from commit 68e3bd469f2e8190db70d4e1564fb46d01feb5f4) (cherry picked from commit af124b9ccbb0b699ea5d1bf1530613cb9a96f205) (cherry picked from commit b89ab4874d403c784c92e579f4f6a854621c0078) (cherry picked from commit 0f2a2f0d0ff9851428d6899e307f3547d7651f87) (cherry picked from commit 80999363c73e4e01cbf9116491743c87baa952af) (cherry picked from commit f8880b5463aa1db047d89080d21e7a69979eb4a6) (cherry picked from commit 5f4cf4f6e143237c81da3e80875727cef4b76343) (cherry picked from commit b38e26bc1a8bb117f571672961a8445cfc02c953) (cherry picked from commit d839e0033244b63df16c8b548cc52106fc693629) (cherry picked from commit 32ffe2e4f12c16a44a759c906078d40731c1a0c7) (cherry picked from commit f1fd0504add78ae3fb5c710ab5a9ada20321afac) (cherry picked from commit 6d77ea4d60a193d9d4175c4943b34077228e5964) (cherry picked from commit 61a0a4a276303c3fd56f93fd109e3416cfdf7c60) (cherry picked from commit a90b4126fdd55feef43f45d1dc3e3400806a476b) (cherry picked from commit 9a20538fb4e88682e213a20813b77cc0f602fbfd) (cherry picked from commit ce0fc02f0fbaa45b146fed175ce68bd02c507f3e) (cherry picked from commit 541f7cb026f976d078ecb6da3a6c9e13cc4336f2) (cherry picked from commit d6d0c2ab78a14d7aac8d7b6b0d007149de2f7295) (cherry picked from commit 2c28f5ad2496cf30eb15d6caf9171b79e5017141) (cherry picked from commit 9571bddb3308e3c1f0383e60f972ca61a0a467b7) (cherry picked from commit c83ba08d01f149ecd52d983eec76bd60822c1ddd) (cherry picked from commit 30e7d567ede79c015d0d115d9a2d535e6c681cb9) (cherry picked from commit a8b8c3eba75511449dc97fa27b37db1076ce95f0) (cherry picked from commit 8e053e1ade4710ade3b6e4bc6aa04fe9281243d7) (cherry picked from commit 9e3b0f7520a56e5eb22cd0e33e231ea9063f0e1f) (cherry picked from commit 2343b9bd09cda3e474b36842fae419f9fe32b134) (cherry picked from commit 56572d4156050c2beb62f63a871375fdc2424271) (cherry picked from commit 9b09eda1680282f8114f752e52afd544ef30350c) (cherry picked from commit 86a8b7b4904158ea80d259d7a1846528a9b3c403) (cherry picked from commit 99a550c0e3de3bd8d17a610b849da0c04f776dbd) (cherry picked from commit bdcf3f51e07c9f5f067fca7501ad69c42f925197) (cherry picked from commit cec8f2d31e1cd9237120ee57af80b17e4abf026e) (cherry picked from commit 25aa22ba2b8b8bdb215c14002ebc137e2e70cad4) (cherry picked from commit 31510249a01fad40cc001277f5bcbe57248b0330) (cherry picked from commit 95dc569227ac57c2efe7817edb6749fcead0ec24) (cherry picked from commit f6caf5f1b9f8f560fcfef29247525c018976dcde) (cherry picked from commit aba34fbf70dce183907083593cab7716597575a3) (cherry picked from commit 41b816fdac30cfca311d5c24c155301de5d08a40) (cherry picked from commit c98e79b89f5a12b50b6eb1ff1d0afc2cbd756ca3) (cherry picked from commit d33d4f193cd79493e3d206e0c73395aea5bd305c) (cherry picked from commit 4e5bb41cbe9823f8c198a54b56f0ee66b9cf8bf8) (cherry picked from commit 3aa8ddb8cb4cb836b98c465342b106d027868606) (cherry picked from commit e8057040bb751d1bdcb0e7412495da353189a02f) (cherry picked from commit f3bf61e51e8c44ac098dca03532507bae5b65fc1) (cherry picked from commit e9d08aad76cc38a81e9489871e1116819f84052e) |
||
Codeberg Translate
|
a485566356
|
[I18n] Translations update from Weblate (5 February)
[I18n] Translations update from Weblate (#2254) Translations update from [Weblate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/). Current translation status: ![Weblate translation status](https://translate.codeberg.org/widget/forgejo/forgejo/horizontal-auto.svg) Co-authored-by: earl-work01 <contact+work01@earl-warren.org> Co-authored-by: walpo <walpo@users.noreply.translate.codeberg.org> Co-authored-by: Gusted <postmaster+codeberg@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2254 Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org> Translations update from Weblate (#2258) Translations update from [Weblate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/). Current translation status: ![Weblate translation status](https://translate.codeberg.org/widget/forgejo/forgejo/horizontal-auto.svg) Co-authored-by: Squeljur <squeljur+git@gmail.com> Co-authored-by: oatbiscuits <oatbiscuits@proton.me> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-authored-by: jadedctrl <jadedctrl@posteo.at> Co-authored-by: earl-warren <contact@earl-warren.org> Co-authored-by: 0que <0que@users.noreply.translate.codeberg.org> Co-authored-by: noureddin <noureddin@protonmail.com> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2258 Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org> [I18N] Translations update from Weblate (#2274) Translations update from [Weblate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/). Current translation status: ![Weblate translation status](https://translate.codeberg.org/widget/forgejo/forgejo/horizontal-auto.svg) Co-authored-by: Gusted <postmaster@gusted.xyz> Co-authored-by: 0que <0que@users.noreply.translate.codeberg.org> Co-authored-by: oatbiscuits <oatbiscuits@proton.me> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2274 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org> [I18N] Translations update from Weblate (#2280) Translations update from [Weblate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/). Current translation status: ![Weblate translation status](https://translate.codeberg.org/widget/forgejo/forgejo/horizontal-auto.svg) Co-authored-by: earl-warren <contact@earl-warren.org> Co-authored-by: micash <micash_545@protonmail.com> Co-authored-by: 0que <0que@users.noreply.translate.codeberg.org> Co-authored-by: oatbiscuits <oatbiscuits@proton.me> Co-authored-by: jadedctrl <jadedctrl@posteo.at> Co-authored-by: Werenter <abelokopytov149@gmail.com> Co-authored-by: bizdelnick <mikhirev@gmail.com> Co-authored-by: Xinayder <me+codeberg@aoalmeida.com> Co-authored-by: noureddin <noureddin@protonmail.com> Co-authored-by: nykula <nykula@ukr.net> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2280 Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org> (cherry picked from commit 9efeca55b1032d16284ad5e687440405cab775ef) |
||
Earl Warren
|
316d88efba
|
[DOCS] RELEASE-NOTES.md (squash) v1.21.5-0 (squash) go-git
(cherry picked from commit 6fc9ce83caf1cde207f375459b8a1d5495f7b78e) |
||
Earl Warren
|
cbff4b34c0
|
[DOCS] RELEASE-NOTES.md (squash) v1.21.5-0
(cherry picked from commit 29bdaed6d2ddc4df750886d4833e0ca2d1f189f9) |
||
Earl Warren
|
34d21f6bc2
|
[I18N] add [common] as first line
To keep weblate happy as it would otherwise be duplicating the content to all sections. See https://github.com/WeblateOrg/weblate/issues/10831 for more information. (cherry picked from commit 5ffc10a00e1ceb24755894e981d3d26d654b4b7e) (cherry picked from commit 96d10e793b72e39656cc0df02272c7dd7632964c) |
||
Earl Warren
|
20b5ca1e6c
|
[I18n] Forgejo translations
(cherry picked from commit 31378c71ef526f28fcbce5bbf0e91e25ae9f9939) Conflicts: options/locale/locale_sk-SK.ini s/Gitea/Forgejo/ [I18n] Forgejo translations (squash) forgejo-branding (cherry picked from commit c29b72ce6d25778c90b8b4bec0797847cdcec6b2) [I18n] Forgejo translations (squash) forgejo-dependency (cherry picked from commit 8c87dd72360f07748ab69db62613db2dc811d936) [I18n] Forgejo translations (squash) russian from weblate cherry-picked from https://codeberg.org/Werenter/forgejo-translation (cherry picked from commit 7fec29809b73c7eecbb18a6af21fdfd0cdcf88cf) (cherry picked from commit 1e3c6af5fe354ff0965480163c9e2cd66245f34e) Conflicts: options/locale/locale_en-US.ini https://codeberg.org/forgejo/forgejo/pulls/2295 |
||
Earl Warren
|
cb8c9d5bcf
|
[I18n] tooling and process
Before: * Translations were imported from Crowdin via Gitea * New strings were added by Forgejo in feature branches but never translated * The build/merge-forgejo-locales.go script in the forgejo-i18n branch added/replaced Forgejo specific strings in the translated files at build time * Conflicts arising from Gitea changes in locale_en-US.ini were resolved by moving around Forgejo strings Transition: * The build/merge-forgejo-locales.go is run once on the source * The result is commited to the forgejo-development branch After: * Translation are exported and imported from translate.codeberg.org * build/crowdin-to-weblate.sh run is run when rebasing (soft-fork) or cherry-picking (hard-fork) to collect new translations from Crowdin via Gitea * In case of a conflict Forgejo translations are authoritative * In the absence of a conflict Crowdin translations are uploaded to Weblate (cherry picked from commit 9b5b7140480a75edb070d4151f585c20d3a08f64) (cherry picked from commit 6c7b5e322d1dc736f2e2d9725f77f09bbdb5ffa1) |
||
oliverpool
|
9e54952a51
|
[WORKFLOW] issues & pr templates (squash) fix link to CONTRIBUTING.md
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2232 Co-authored-by: oliverpool <git@olivier.pfad.fr> Co-committed-by: oliverpool <git@olivier.pfad.fr> (cherry picked from commit 8c0e5d07f8a95ebe4e6102591302effbe13f58e3) (cherry picked from commit 77716e7cd4c2e5ecfab5fcf1a5d8d2b3b3f778aa) (cherry picked from commit d0d004fe027e2af6e2ef8487b9d04c4f5b42352f) |
||
Michael Kriese
|
97cc955101
|
[GITEA] feat(nuget): basic manifest download
Refs: https://codeberg.org/forgejo/forgejo/pulls/2222 (cherry picked from commit 5f837efc15f3d1e0d7fbed7fc569251143266584) fix: write xml header (cherry picked from commit a715984a42be9da81c48106d5eae244098ac1108) fix: optional elements and xml schema (cherry picked from commit 6ea6895a3616246e7282aa20d8f010fa931b60ea) fix: pass all other requests to file search (cherry picked from commit 9bfc74833a3b657453b4519573598432a87e3e3c) test: add integration test (cherry picked from commit b798f4ce86daa78e694c5c142e6f5f44938e6cb6) fix: use xmlResponse (cherry picked from commit 7f76df0b246c64fac0eeb115642c8cb6eb676f36) (cherry picked from commit e18d574ca40905aec52fbbe8247ba83fd01874dd) |
||
Cyborus
|
bfe87e30af
|
[WORKFLOW] issues & pr templates (squash) allow empty issues
Refs: https://codeberg.org/forgejo/forgejo/pulls/2164 (cherry picked from commit a6f2ca8c4435af2f83867b40aa8c74af6fd2d7d3) (cherry picked from commit 22933182e573168ee10a1dbf713e0f46f5dea8e4) (cherry picked from commit 9fe826605f1c1f6f25f23ff27310218575bed14c) (cherry picked from commit c296aeaca6fba3721aa5eecb3f91c33bf1220275) |
||
Earl Warren
|
2625bb5fbc
|
[DOCS] RELEASE-NOTES.md (squash) v1.21.4-0 security
Refs: https://codeberg.org/forgejo/forgejo/issues/2158 (cherry picked from commit 7e663e496e212ec4f27f8808c441ab583d48c9ad) (cherry picked from commit 3e5d45a2ab1a98f14c53f5aa36bb164ce6d7a3aa) (cherry picked from commit 6c22e906fbaffc4451020e113b5ca2d890f1cf67) |
||
Earl Warren
|
df67c2926f
|
[DOCS] RELEASE-NOTES.md (squash) v1.21.4-0
Refs: https://codeberg.org/forgejo/forgejo/issues/2158 (cherry picked from commit 5033cd2a43d64775660d35a9cc44c77018dc9646) (cherry picked from commit 6c6dba480c2d4f093b970fb2635a108fedf4581e) (cherry picked from commit 73a050c001e28d7e909d64bfaad708fef1e0e347) |
||
Gusted
|
8735fcdb7d
|
[GITEA] Vendor rupture dependency
- The [rupture](https://github.com/ethantkoenig/rupture) dependency was essentially outdated in the sense it was using old version of dependencies. - The usage by Forgejo was rather a small portion, so that portion is now vendored (with its tests). - Removes old dependencies from go.sum (less dependencies is better for reviewing what the heck we're importing). Just to note that they were likely not being used by Go's build process (according to https://go.dev/ref/mod#minimal-version-selection), so it's really a matter of formal cleaning up dependencies we don't use and therefor don't want to download and be in our go.sum. (cherry picked from commit aa72a5f009b5027b2324106343f91b466ba46293) Conflicts: go.sum https://codeberg.org/forgejo/forgejo/pulls/2148 (cherry picked from commit fbe8d65f0b1836b2e771991b4d5d12f1bfa938ed) (cherry picked from commit e18debcb6a9476f60d364e847265b4ac7fb76c8e) Conflicts: go.sum https://codeberg.org/forgejo/forgejo/pulls/2245 (cherry picked from commit 8c43c2ada82102a0df44fd874c4f5fe3a36ef758) |
||
Earl Warren
|
c070935f13
|
[SEMVER] 7.0.0+0-gitea-1.22.0
[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) (cherry picked from commit 2d75f86f0e4c4da24fb965e7f605296c303b7ea7) (cherry picked from commit 29119a870f5fa68e5ddafdfa1bb388d385396f6b) (cherry picked from commit 76dd36c9eb116d042ba25b4d241a9b1e5ca37bfb) (cherry picked from commit ea761bd43c7042b7d4ac4fad20b0c9e780f6e553) (cherry picked from commit 561faf9af5a2c89461625275aaf46ac4071a5b50) (cherry picked from commit 78e512770ff9a749675343a5668b142eeb3df251) (cherry picked from commit e16f5b02c6d34d9701c4da39f2fc2294fb69c73c) (cherry picked from commit c120212caf0974139109c4c008b6d25a32ca56bc) (cherry picked from commit a4807748c3197c0c964f20cdf9641d73ab19b7d6) (cherry picked from commit 78fd92eae3b3f33baee8dcf0d24ce7b22fadf408) (cherry picked from commit 2f80066217a418bcc01654b27fa6483ff8b15991) (cherry picked from commit 598756833e65d2ac6c99fc5f3e778a7309d11acc) (cherry picked from commit 93f62e98523ffd867e08d51596d30c4e24c9fcd8) |
||
Earl Warren
|
a8538928f7
|
[DEADCODE] update deadcode-out
(cherry picked from commit ff0554a18464ff3c6bfaf9551984e8d2f54d8298) (cherry picked from commit e9901814be58afa1aaa9c904b5b3e56e98bb96c5) (cherry picked from commit 9ff7c41d53cc68e48a398bc666f82e94720899be) (cherry picked from commit 9601dee4a3b792797df6207cd3431dd693e632bf) [DEADCODE] update deadcode-out (squash) update (cherry picked from commit aef379c5f5c3efa0dc959ea6e3b31acef43eb59a) (cherry picked from commit 75473ea87af675b71dbae382199cd873627ac93c) [DEADCODE] update deadcode-out (squash) update (cherry picked from commit 868b7a436f37f2946d3b0095e3b91029876de5bb) (cherry picked from commit 38787c8779bf461672dfef0b85a3bf4c1ffbf7ee) [DEADCODE] update deadcode-out (squash) update again (cherry picked from commit 91b2932907e0c21cb95bfcdff7258d0800273a51) (cherry picked from commit 39adff772d209dd281d70412276cca5c72024243) (cherry picked from commit 9f76193ea4c44d66c5ffc9506cae5156a15223ab) (cherry picked from commit 8968396cbcbdf546f4cc6283b37a6e4fded56d74) (cherry picked from commit f87e11e2ebdde6171b36bf8363b18d923f61fad3) |
||
Alex Syrnikov
|
c28b19b953
|
[DEVELOPMENT] added /local/ to .gitignore
Added `/local/` folder in `.gitignore` for developer personal files (rebuild, deploy with custom config, backups, sqlite databases, test curl query scripts, custom configs). In case of building, deploing, testing locally developer needs some folder for custom personal scripts, configs, data. `/local/` folder in project root is a good place to store all this files. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1816 Co-authored-by: Alex Syrnikov <alex19srv@gmail.com> Co-committed-by: Alex Syrnikov <alex19srv@gmail.com> (cherry picked from commit c8138849ebecd88d62d10584195a748263de4710) (cherry picked from commit 7880660738574929184dcb787687c3de3baa2205) (cherry picked from commit cf9af01d88cf4e6429417189d52c269f9fd8efb9) (cherry picked from commit 8d1dcc9e0ec933ca99190700c99ff63106db2839) (cherry picked from commit 93dd605948635acb358960fc25563031d4aa5527) (cherry picked from commit 74972ae17f5e25c9fa141d4d667e730a95f166f9) (cherry picked from commit f76ce785782848318ba8d58336e02ef930455752) (cherry picked from commit eb3e46cd3be5408cb53e1f61dab408787b4d317d) (cherry picked from commit 5b0125591d4005c7465da21dc8a8e290858db9d4) (cherry picked from commit 31d86205d25f4fd5a5b2726eaf701a387c9f3391) (cherry picked from commit c2e62c6705a1979883d1b164118fb36360835a32) |
||
Gusted
|
c2053dd076
|
[SHARED] make confirmation clearer for dangerous actions
[GITEA] Fix cancelled migration deletion modal - https://codeberg.org/forgejo/forgejo/pulls/1473 made that dangerous actions such as deletion also would need to type in the owner's name. This was apparently not reflected to the deletion modal for migrations that failed or were cancelled. (cherry picked from commit c38dbd6f889aeb52745eddb276225acd0153cba6) (cherry picked from commit 7c07592d01b086b612195367c6a13560e5539767) (cherry picked from commit 78637af2b6440ae307de5e21b284c08c02dd4d13) [SHARED] 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) (cherry picked from commit 9fbe28fca35e3d02c23521e063679775ec0792f8) (cherry picked from commit 4ef2be6dc705c693735e024b28fd7dac3de39d47) https://codeberg.org/forgejo/forgejo/pulls/1873 Moved test from repo_test.go to forgejo_confirmation_repo_test.go to avoid conflicts. (cherry picked from commit 83cae67aa3fe8f9eb732f86020e58b9ea4d8b5ec) (cherry picked from commit 447009ff568a542985f6b3a9bc7237b9de3e3c54) (cherry picked from commit 72c0a6150aee7c3a965c87e7348faa2b48c520de) (cherry picked from commit 8ee9c070b98f64263d63dfef32d54bdad5f0d266) (cherry picked from commit 89aba06403be898adbfff6b2d7bb01aad239a87c) (cherry picked from commit 798407599f3d77bdd8bad5fa7abba81d417cd916) (cherry picked from commit 41c9a2606bd8d7036e7d54ad7ab35af06ec99a34) (cherry picked from commit a57b214e366435240c4a210115c6a3fda0d37f8b) (cherry picked from commit fd287a91349bc7844544f9b6ff88e46157d3dc80) |
||
Earl Warren
|
8cbd00592d
|
[TESTS] createUser via the user model helper for integration tests (squash)
See https://codeberg.org/forgejo/forgejo/pulls/2295 |
||
Gusted
|
c6a53c3172
|
[SECURITY] Rework long-term authentication
- This is a 'front-port' of the already existing patch on v1.21 and v1.20, but applied on top of what Gitea has done to rework the LTA mechanism. Forgejo will stick with the reworked mechanism by the Forgejo Security team for the time being. The removal of legacy code (AES-GCM) has been left out. - The current architecture is inherently insecure, because you can construct the 'secret' cookie value with values that are available in the database. Thus provides zero protection when a database is dumped/leaked. - This patch implements a new architecture that's inspired from: [Paragonie Initiative](https://paragonie.com/blog/2015/04/secure-authentication-php-with-long-term-persistence#secure-remember-me-cookies). - Integration testing is added to ensure the new mechanism works. - Removes a setting, because it's not used anymore. (cherry picked from commit e3d6622a63da9c33eed1e3d102cf28a92ff653d6) (cherry picked from commit fef1a6dac5e25579e42d40209c4cfc06879948b9) (cherry picked from commit b0c5165145fa52f2f7bbec1f50b308bdf1d20ef3) (cherry picked from commit 7ad51b9f8d0647eecacd258f6ee26155da3872e1) (cherry picked from commit 64f053f3834e764112cde26bb0d16c5e88d6b2af) (cherry picked from commit f5e78e4c204ce50b800645d614218b6b6096eecb) Conflicts: services/auth/auth_token_test.go https://codeberg.org/forgejo/forgejo/pulls/2069 (cherry picked from commit f69fc23d4bbadf388c7857040ee0774b824e418e) (cherry picked from commit d955ab3ab02cbb7f1245a8cddec426d64d3ac500) (cherry picked from commit 9220088f902a25c4690bcabf5a40a8d02e784182) (cherry picked from commit c73ac636962c41c71814c273510146f0533264ab) (cherry picked from commit 747a176048ea93085b406429db0e25bb21912eda) Conflicts: models/user/user.go routers/web/user/setting/account.go https://codeberg.org/forgejo/forgejo/pulls/2295 |
||
zareck
|
3916357840
|
[TESTS] add TestAPIForkDifferentName
Refs: https://codeberg.org/forgejo/forgejo/pulls/1719 (cherry picked from commit ed3413891523b07d4da47347b632ad3a3c7bd16f) (cherry picked from commit 166d769a6eda0cece2ccbfd3c12f1fce41e2c5b8) (cherry picked from commit 8da818646c7c129b9a61b9b983f20ab1af897bc4) (cherry picked from commit 95c9d6ede40f3aab7578f38b1881a2472fd20931) (cherry picked from commit 505ffa2cc444d5917d394a2cebd5e4554d6a0370) (cherry picked from commit 602bf1fa7f2f3d4db73dbab83ba889a6b9701427) [TESTS] add TestAPIForkDifferentName (squash) do not use token= query param See https://codeberg.org/forgejo/forgejo/commit/33439b733a (cherry picked from commit d600fabdbcaa8eb01e7b0f6bf337fa1aa844c2da) (cherry picked from commit 40c1130c410359ab007c2b92081856ca0f805c55) (cherry picked from commit 7b254f84cfd3aa58ee80d7ea8ae0e1c9636cdc3e) (cherry picked from commit af15c5a60a773b4af8760f94b82ab704f19a29be) (cherry picked from commit 852b42bc7a48620efd778cea728374cc1e325451) (cherry picked from commit 90b3d0ca09a2057265ee371767232496399168ce) |
||
Gusted
|
6f960f23e5
|
[CLEANUP] Reuse ForgejoVersion variable
- Resolves https://codeberg.org/forgejo/forgejo/issues/1226 (cherry picked from commit e383b70109325833034dd0593727e5eec3acf92d) (cherry picked from commit 029cfa34de06e7706c3f85134468f2faadf30a21) (cherry picked from commit 81392b8c55b2f5893a3222c521f697d1d53adbb2) (cherry picked from commit 0ebecca1e6edd31ec95c5d8be3d02814fb39179f) (cherry picked from commit aff135418d96b1f7418e55882ee0bbdbf2b04c5e) (cherry picked from commit b5982f5008a0a60d0cf874edbe281c3f73b69e97) (cherry picked from commit 00f86df8f4f4072eb083426e807a9164be0dbc38) (cherry picked from commit 178908c047b9a13a7b61e90490d525ddbeae45e8) (cherry picked from commit 9cc57d1b3f48a9f530fb761bd70d224d069ea1eb) (cherry picked from commit dc80ba9a97d3e8f78a9ecd3875105375611ebc45) (cherry picked from commit 5b2f1d7149b3098b6b82ae8d588068ba476eb534) (cherry picked from commit f0ab85cd06a37eb81343c830180b6283e924015c) |
||
Gusted
|
089f51a63c
|
[DEADCODE] 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) (cherry picked from commit b5ea6e85acecb8c02d18d51ec489bb1d329a33ce) (cherry picked from commit 5915f3643c1939ab09dcac8f9fcb74bd4231a16d) [CLEANUP] Remove deadcode - This is deadcode since https://codeberg.org/forgejo/forgejo/pulls/1802 removed the usage of it. (cherry picked from commit d840b9923e1a7aad7306c6b4d02df771ed0f40f4) (cherry picked from commit 9442bab6266807141a14a647d3bc383233fc56e9) (cherry picked from commit 0de9d18863c6af44941c7021548cdb07173ba3c0) (cherry picked from commit 26abf783746ef29e66eea966160e2f9c139add26) (cherry picked from commit 05d3a143c3785f3cc5e7f561aa2ad2ba556b55cc) (cherry picked from commit 4b3d38d5e15b0fd02839d5687b634e7999e12666) (cherry picked from commit a726e7198613b330a58c8c6dfc8866c360fbe555) (cherry picked from commit cb62ae5b9885bcd5c2b6cb60f0e9cce6a991cc3c) (cherry picked from commit 8195ba06d52fc1a05e9907149bb441b66887870e) (cherry picked from commit 4570fb591aac0359a36800c8cadcd71613bdc7df) (cherry picked from commit 1f4d33de2b68c776a305fe38fe6be5ae510ce983) |
||
Earl Warren
|
c7a389f2b2
|
[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) (cherry picked from commit 5110476ee9010ba8cdca0e0f37f765f8800e9fe1) (cherry picked from commit 77ba6be1dab4f6f3678d79a394da56e6447ebbe1) (cherry picked from commit 9c8337b5c442cfd72d97597c2089e776f42828b7) (cherry picked from commit 1d689eb686f0f7df09c7861b3faf9d8683cb933b) (cherry picked from commit 511c519c875a4c4e65c02ef0c4e3b941f4da4371) (cherry picked from commit 2f0b4a8f610837d34844bb79cda1360ab23b6b1c) (cherry picked from commit fdd4da111c449322901a0acf6d0857eac4716581) [FEAT] allow setting the update date on issues and comments (squash) do not use token= query param See https://codeberg.org/forgejo/forgejo/commit/33439b733a (cherry picked from commit c5139a75b9e4af612a628171bd4f63a24860c272) (cherry picked from commit c7b572c35d3e9e22017fd74045bcdc1109bd06df) (cherry picked from commit aec7503ff6dd177980f3d9f367122ffc2fec8986) (cherry picked from commit 87c65f2a490faeccb85088fa0981dd50f7199eb8) (cherry picked from commit bd47ee33c20e53ae616a7e53d63c3b51809585fb) (cherry picked from commit f3dbd90a747c14fb1b5b4271db6c10abbf86d586) |
||
Earl Warren
|
563b7f8345
|
[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) (cherry picked from commit 64fcb25de359de5c3956e6f7ce3241423889c068) (cherry picked from commit 740943d6b0df5793d827f5097fbfd152582e0c73) (cherry picked from commit 3c096abf11abc94492f412315638bdf64c2ec1b9) (cherry picked from commit da04dcb099ff4193818aebd98016c48e16faa444) (cherry picked from commit b881d83f1c0ecc281aa00f0c4b327d141a247d31) (cherry picked from commit 7e7492b996dff5d54888831a3e2a43b838c02259) (cherry picked from commit 869edd3b0a501f128d41472f56378dc696b7e67e) (cherry picked from commit d96fbda2741b975594b13560cc25759f665e6d28) (cherry picked from commit 09c00cbd00258c12d5606f471890e62c914c765e) (cherry picked from commit 10a1bf8122740f68fbb1062bc2f4b5d04086c72a) (cherry picked from commit 2eb223c0f6fb11310aeabf1e85a0e45b061d8f7c) (cherry picked from commit 1eaba14638af185453c78e092a9a5088b8c76d79) |
||
Earl Warren
|
3518a1d4cd
|
[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) (cherry picked from commit a0abe20b1bb4808805796b9073719fea60325443) (cherry picked from commit 6f5c2f902e5c2ddaf6bed6909da9e2b4d864aa36) (cherry picked from commit efbae03e021bad051e685ca702265212c2d58c32) (cherry picked from commit a763b5949f8be1317e0b25d7c5b093d33a3f5216) (cherry picked from commit d611dc07ac34033c63802625f13795c4fbe25282) (cherry picked from commit f31264ab575ea4f973f1714af3f628b57c20a5fa) (cherry picked from commit a32a1fcd949ab349902074ea9719602277f95ff4) (cherry picked from commit 568711e1034df110c212517964654b4270583ea8) (cherry picked from commit 80ef96485716fc1f339b97139ddd9c749d9b7526) (cherry picked from commit 66af8f2ae877b1dff82f724ebc9e5ab231bbb282) (cherry picked from commit 7a1c9fa23623b57943c5c377ec8a43bac14c5539) (cherry picked from commit f140388ae451cd0ca028bec57a038284b2da353c) |
||
Earl Warren
|
27ee15e86e
|
[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) (cherry picked from commit 06a47ea56efdb604c51d1bda91a9cd9eeee12bd2) (cherry picked from commit 5a4d56e77b6b266f684bd36c652cb6496da8c1b4) (cherry picked from commit 84b9d3a0c3a86e19f129cfb7ee4816e2eec12234) (cherry picked from commit 1eb2eca71c1b4b58dcdb87b70b40b0666512c9d6) (cherry picked from commit 11d0fe54009d34eca00827608ca8a97e21bc85db) (cherry picked from commit c93b8b9d3c69bca079eb192eeb06850b80d901ef) (cherry picked from commit 679a7e2efa85f2dcda3b17fc246c209a57d3dead) (cherry picked from commit e31a3abb7dc8f8879c7077e37cd55b34014c2060) (cherry picked from commit 72bedf68a7a86aa214169e67d3e0d04cafd4ce4b) (cherry picked from commit ef139ac06f29d561c82c847c5d1a648db38dc759) (cherry picked from commit 134bf839825d720fd43c08076f1dad2ba23aca51) (cherry picked from commit caf5780c5758851cc5d7d584ed5e78291e5d1d14) |
||
Gusted
|
52e863ba5a
|
[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) (cherry picked from commit 6d882ede35b29f613ab625c16cc5a7ffd7fcc393) (cherry picked from commit 7c8d754ac6e444aff9acdc6cff1a4270947aeeb0) (cherry picked from commit 842000a5864dc71dff3acd299e018f51cec300f7) (cherry picked from commit 40d49b5107499d7b270eb22e93149760a080b716) (cherry picked from commit b446a99335a5409c5582141f3c1c23e9d712eab4) (cherry picked from commit 6600fa86c32bbd2b9a2a43771c40706421e289a4) (cherry picked from commit 1d16607db5edab9ebe7c4039d7651e6989a2d9c9) (cherry picked from commit ee5da9318bfffff339b8866a87be454c24246fac) (cherry picked from commit 49e033cec8e924b21c84a20eca213321891ecd11) (cherry picked from commit 9bca34ef03c28e471b3f8ea057ba0b720d4249fe) (cherry picked from commit 59c0454c2125baae0427d7ce2c3d698c25ad65cd) (cherry picked from commit be081bca694d6822a604fe017fe93c4fb1a51308) |
||
Caesar Schinas
|
6de3c938ee
|
[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) (cherry picked from commit 861fb8ee615f4a0e47a41624f759544872055838) (cherry picked from commit aeb6f7a5fcd66f623e36c6a59eb57b41d5097318) (cherry picked from commit cd4759816cfa68d92f6003f617356d15f7820c23) (cherry picked from commit 1d58ed60dd392e9d93e904582c25ee07c30abc4e) (cherry picked from commit d6e4bf1523a7ca7a5f866b6fac59d7a6fdee8aee) [WORKFLOW] yaml issue templates (squahs) fix typo Refs: https://codeberg.org/forgejo/forgejo/issues/1958 (cherry picked from commit a962747b405903eafed2369e3914cae4e6bfbdda) (cherry picked from commit df4123474bb045c172d8e1c7dd316e1737a4cc12) (cherry picked from commit 0e56506a9ba5196d37490749f63716fd09c74a38) (cherry picked from commit 7664a4c9fce22b7d87d3a348d60c290bee24557b) (cherry picked from commit 5e25c46ba292879a457cadbb5c9e7f6327881c8d) (cherry picked from commit bc02f05346bfe8f8c7997ca6d4ff1cbc8eac7d67) (cherry picked from commit 084e3b5e2f67fc248ef98e4ae165e8ba58e9a508) (cherry picked from commit e53c0314e91307cc9c30791148701645e47f35bb) |
||
Earl Warren
|
f6ba73de4c
|
[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) (cherry picked from commit 8c5d8bfea0d65ebab33e2cb7dd04298d0f263fdd) (cherry picked from commit 2817ce027cbcd630d83484c98b9539a3a94a5266) (cherry picked from commit 162056cbcfd79710e4d81b1b36f650be291df832) (cherry picked from commit 07152a0ba640f71fa669ef84c473eb773a15ede9) (cherry picked from commit 72e37779159a1820bb2d02b4647967fed3c8abc2) (cherry picked from commit 3b1ebd95b94327b8056eed51e9c6dbb4c412af09) (cherry picked from commit 14fc4f3fac637fb026a64b6110026533caa11dfc) (cherry picked from commit 9052c86e8ce97895eec8642bdb1c987790924b03) (cherry picked from commit 16f1cc21ea518c5390061534c8cfcc8f9f0c2587) (cherry picked from commit 0fef12f5d85870fa364d6046ac04dcdfc8cb69df) (cherry picked from commit d187381f73a0859198aade34057c63aef38d764d) (cherry picked from commit 9dda7151116af3a0d52b0778eff0f837d6bd1cf5) |
||
Earl Warren
|
160ae5ee23
|
[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) (cherry picked from commit eadbbb1afe6f36cfaf4cc3fc346b510893f21011) (cherry picked from commit db22d61eb47b56cc7cf0f44934f8f550df029e76) (cherry picked from commit 9d3b0be39a008e2e1a4f474b0ab74627e003430d) (cherry picked from commit b3fa3c1292228ef4833b6ea1f120102471478256) (cherry picked from commit c8300d4fe24fccaefc18e95ec8c6d689f1cb4d7a) (cherry picked from commit 8ba6a4c9dbd9cbb2758b02016f1858d1e85633ce) (cherry picked from commit 8b8df652c1eb7806e590751942b4689e374e1128) (cherry picked from commit fc8fa050c688451c9c2079b1f0f71ed11a6d7e4d) (cherry picked from commit bcf3faf69843421517bf3ddf032fe92cbf0a766d) (cherry picked from commit 514a631aa650987ef3400ad31eb32af676a97164) (cherry picked from commit 529c7a09f73bdb27ac14e0cdb6312eac2bc1109c) (cherry picked from commit 0d093d76e2d27523f42606d78c1302057c328913) |
||
Earl Warren
|
20f022de72
|
[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) (cherry picked from commit 11717b864bf4d820305511cf22ec50f61604a770) (cherry picked from commit b70f3e0fa5db9cd90c961138c1ab748aa5c6a4d8) (cherry picked from commit 2d802b2963d18b28a85a82e01f7a7f18ab8c3192) (cherry picked from commit f61e2f71e2d629cc4e480f9e61c9b383675da0ef) (cherry picked from commit 31723651c96d3f20811540aad94878815795da15) (cherry picked from commit 38f6f703a0dfb04a9d436c8c806f1be513c7ea3a) (cherry picked from commit 75f6716905755cbe3d7e49d965ab81a47f625bb7) (cherry picked from commit fed2b2daf5d44348a0096572e91708ac3db5e9c8) (cherry picked from commit a9bafa50213a3a385ba3901b2730fb84149855cc) (cherry picked from commit 8ce897b3fe918c5702d5c86d97f1703a1f266697) (cherry picked from commit c806addcd07c6afb20d9aca833cfa9a33ac680a7) (cherry picked from commit e70d51bd26b49de93b2fe012a4f03efbe6c97607) |
||
Earl Warren
|
726f3b1d84
|
[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) (cherry picked from commit 0285c997749457cb6f67c5f3ca68e62721b53023) (cherry picked from commit 0527bb20db0b22a1640f7d058399bc42ab8f9b98) (cherry picked from commit b4d3fd43e314197f059830fe36d532888ef14c62) (cherry picked from commit b45db6430024313f9530c1443d54630213f3b34b) (cherry picked from commit 722ab376118847dca33ed5a47b6a41edda132b63) (cherry picked from commit ff45632b42b1e5e741858a8f3bdb89a6d79cbe3e) (cherry picked from commit 5144ae2aa7e1d903ecf6047902d9608cb6ae5500) (cherry picked from commit f51438cd6888b9964c60369fecf64b727fe95ce1) (cherry picked from commit 5ec304e5a178fb8c067b957233f54d8014df432f) (cherry picked from commit 440b8c1af1d18f364f290fa385274d821b04c131) (cherry picked from commit e5bbc626c1228a810bc8d6830cc5a3ee00d1baab) (cherry picked from commit a996fe0fe4593d2f0432cbd8500f91cbbb011bb2) |
||
Earl Warren
|
081a155cc1
|
[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) (cherry picked from commit f83f0f9feb76a8b62ca4d74dc2785c713fbec282) (cherry picked from commit fd1c3a6d09a057070844cd955d0920518e60f408) (cherry picked from commit f7cdc3d6f1ad1ff01bb1814207fcb41210db80e8) (cherry picked from commit 060121b644e0515a6b673cdd514d52e6fa1e6ec3) (cherry picked from commit 62c847ff0235196e73e860d0d1658f0734985270) (cherry picked from commit 4d051b51c2813828b978ef84b6b72c0ba051741b) (cherry picked from commit 86e6981a936b1937065605892083b2488424bf5e) (cherry picked from commit c1fc9e441b1467033911f3848f82a89aaacf98a9) (cherry picked from commit 8bb2f0871a507d881acf74acf8fb90fd5ebff567) (cherry picked from commit 0cd9fe52511ee06f1b8849325d196f60d8ccd151) (cherry picked from commit b0b44778b4d3e51852d0669dfe6d9a6c334b90e4) (cherry picked from commit 7c2f4f749f1c8986875eebf95254a3db151e5248) |