forgejo

Author	SHA1	Message	Date
Caesar Schinas	02c9b776e8	[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 `b6bcb79987` Improve notification icon and navbar Refs: https://codeberg.org/forgejo/forgejo/issues/893 [BRANDING] Add Forgejo light variables Updates the Forgejo light theme with the changes in `b6bcb7998` These are the same changes as made in 2574dbcff to the dark theme Refs: forgejo/forgejo#893 (cherry picked from commit 9e99fe4f9ec79aebbf34490e12b0acf3097dd5c7) (cherry picked from commit acbb98bd912fc3a28d464eaef1d756f54fd87e8e) (cherry picked from commit c80245ed87d09067d880d6f91c3edaa35e4346de) [BRANDING] fix code highlight color in Forgejo themes (cherry picked from commit ffc49a4e992162a480d5056e1211fc7496e4aa06) (cherry picked from commit c5f45a941e3dd8882164a88b2653407fedf6dea0) (cherry picked from commit eee5427c9d581b8e2cd254d4a15508200622aef0) (cherry picked from commit 89be50ca27a7ad33f109bbc3549220b37875206a) (cherry picked from commit 74e4776ef504870d9831818ee141b12afd5f46ab) (cherry picked from commit 6c4e07a6a718c375ee2d3975ea7bb01d382d1d90) [BRANDING] more accessible text selection color in Forgejo themes (cherry picked from commit 7407605ffdedef8fa320477a3bd7efa06df263e2) (cherry picked from commit 5aab3872cc5bd267bc16bfbcedef66fd03616488) (cherry picked from commit 1ec77d8bd00bc6914d0926d98d503debe41cc6fd) (cherry picked from commit 964c89fce7bb5b4be06d4cd1cac247426061ec2e) (cherry picked from commit 8a8023a4414e27d28f4503e2d2fb12afc4b7aac6) (cherry picked from commit 1c9ffeadf5ce419d576afc89faff9fdd6c1b5478) [BRANDING] Fix navigation hover color (squash) - For items in the navigation bar, use different background colours for hover. - Regression since https://github.com/go-gitea/gitea/pull/25343 (cherry picked from commit 8f3f4b219c449011a810c6a9f946fe216d841778) (cherry picked from commit edfb0eef06e798009389b12b2c0a417c4c845887) (cherry picked from commit a6367fa48a2d10465b5d00aa6fb3db886f3c238f) (cherry picked from commit d5697abe4257390a687102d0964fee15f9214b73) (cherry picked from commit eaf537091997650d9370457b7eb53205a552d267) (cherry picked from commit 58f11e7310dfec6fc6f195aa36e465c846a431c5) (cherry picked from commit 732e1b35d58e1ac5307b80819bd788ac8dc9b71f) (cherry picked from commit 0d794ae1c91fa926d1ddac5eb7b1bc27a9271793) (cherry picked from commit ccc8aed308253aaf7aa81f49d3a8025cf759cfce) Conflicts: modules/setting/ui.go https://codeberg.org/forgejo/forgejo/pulls/1582 (cherry picked from commit 209059fbaf6d034b1bb34ae7add0be0269de7042) (cherry picked from commit 80ba2df4a733d84fe0c9ad60d3638e465ccfedac) (cherry picked from commit 17b325da23b1896b6acd95c0b149a9ec20813cc1) (cherry picked from commit 3518b87c8de21590700060e5222feccc7c54cb58) (cherry picked from commit `4042143f96`) (cherry picked from commit `07f976f9d7`) (cherry picked from commit 1bbc6b93e966b13f077e58b3447605eea60cb67e) (cherry picked from commit 8aa0bba307c45994b69a4790f977e3cdaeb32d70) (cherry picked from commit 94c4a14ac30fe92c13e672538ccfb56d409d2f2f) Update Forgejo theme (squash) - Incorporate changes from `79a4c80f8d` into the Forgejo themes. - Fix that there's no focus or active coloring on primary and secondary buttons for Forgejo themes caused by `023e937141` that moved variablse from base.css (shared) to the themes. - Extend hack to make red buttons darker on dark Forgejo theme to include active styling and remove the unnecessary `!important`. (cherry picked from commit `2e32da4419`) (cherry picked from commit `a4eca09543`) (cherry picked from commit e6e452811d8104d6a824aa0e220d80b61dd3c74d) (cherry picked from commit e9a5addf3daf56c1fec8daf0551463d9ac337534) (cherry picked from commit a1b8b5fa0d05c95ccb0a0b54ac6fb13bafaa3d12) [BRANDING] Update forgejo theme - Inlcude `a103b79f60` and `1b2cd4c4e1` and `376c0e25f7` and `023e937141` into the Forgejo theme. - Fix tooltips not being visual, due to missing background color. - Fix labels not having a background color. - Fix modals not having a dimmed background. - Fix no syntax highlighting on Forgejo light due to missing imports. - Incorporate feedback from https://codeberg.org/forgejo/forgejo/issues/1117 to make the labels stand out less. (cherry picked from commit bc21dc21e1a375160e97eb1d2023d095d9067ef5) (cherry picked from commit 82323c09cc9439e723618e38104d6b705f94aad9) (cherry picked from commit 2da09af28dc91996bd261e008f30bd2b9d0d5a85) (cherry picked from commit 978aeb7cde02738ea245d4d12d21d6376bce58cf) (cherry picked from commit 984c264e19dc9497db67139019bf749591bd8447) (cherry picked from commit 6aa7c8db38627394ad71589e4671554a30d96d39) (cherry picked from commit 4379269a46b8fcd9885dd2ddba574375b46519dd) Conflicts: modules/setting/ui.go https://codeberg.org/forgejo/forgejo/pulls/2116 (cherry picked from commit 9414391ec1e37978615e27d304a12957c9adffb4)	2024-01-15 16:11:11 +00:00
Loïc Dachary	ece61fd4f6	[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 `483d953498`) (cherry picked from commit `e0b863d2e9`) (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)	2024-01-15 16:11:11 +00:00
Caesar Schinas	4a3967a289	[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 `fa7dc92f2a`) (cherry picked from commit `2a7c8466a7`) (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)	2024-01-15 16:11:11 +00:00
Caesar Schinas	7508c24a0c	[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 `915c4f7a7b`) (cherry picked from commit `3b1af856bb`) (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)	2024-01-15 16:11:11 +00:00
Caesar Schinas	af49467e83	[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 `dac4d69218`) (cherry picked from commit `4962eb361d`) (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)	2024-01-15 16:11:11 +00:00
Caesar Schinas	08edee9ed1	[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 `dae4f61afa`) (cherry picked from commit `65b13516e0`) (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)	2024-01-15 16:11:11 +00:00
Gusted	63d014f13c	[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 `33720ba955`) (cherry picked from commit `b39b88fd01`) (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)	2024-01-15 16:11:11 +00:00
Caesar Schinas	e8057040bb	[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 `31510249a0`) (cherry picked from commit `95dc569227`) (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)	2024-01-15 16:11:10 +00:00
Gusted	d9dc25d038	[MODERATION] Block issue creation when blocked by repo owner (squash) - Block the creation of a issue if the user is blocked by the repository owner. - Fix integration tests (This should ideally in the future all be self-created fixtures instead of relying on the existing ones as a small condition can make the tests be inaccurate). (cherry picked from commit 88d3ee333aa91814bbe0b11d9fc1e62ffecae1b9) (cherry picked from commit 146c82d232a5a4a81bbbebcae568b5c3b6117804)	2024-01-15 16:10:53 +00:00
Earl Warren	a3f44f1976	[MODERATION] User blocking (squash) do not use token= query param See https://codeberg.org/forgejo/forgejo/commit/33439b733a (cherry picked from commit 82d3e78bf783200b85089a584d83558958e8328d) (cherry picked from commit 36c43dbf82145c7e4480f207aee4de39b7fe397e) (cherry picked from commit 52f8e06095dfc39a675b8756fd1a1bc5ecc2a93e)	2024-01-15 16:10:53 +00:00
Gusted	ac6201c647	[MODERATION] User blocking - Add the ability to block a user via their profile page. - This will unstar their repositories and visa versa. - Blocked users cannot create issues or pull requests on your the doer's repositories (mind that this is not the case for organizations). - Blocked users cannot comment on the doer's opened issues or pull requests. - Blocked users cannot add reactions to doer's comments. - Blocked users cannot cause a notification trough mentioning the doer. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/540 (cherry picked from commit 687d852480388897db4d7b0cb397cf7135ab97b1) (cherry picked from commit 0c32a4fde531018f74e01d9db6520895fcfa10cc) (cherry picked from commit 1791130e3cb8470b9b39742e0004d5e4c7d1e64d) (cherry picked from commit 37858b7e8fb6ba6c6ea0ac2562285b3b144efa19) (cherry picked from commit a3e2bfd7e9eab82cc2c17061f6bb4e386a108c46) (cherry picked from commit 7009b9fe87696b6182fab65ae82bf5a25cd39971) Conflicts: https://codeberg.org/forgejo/forgejo/pulls/1014 routers/web/user/profile.go templates/user/profile.tmpl (cherry picked from commit b2aec3479177e725cfc7cbbb9d94753226928d1c) (cherry picked from commit e2f1b73752f6bd3f830297d8f4ac438837471226) [MODERATION] organization blocking a user (#802) - Resolves #476 - Follow up for: #540 - Ensure that the doer and blocked person cannot follow each other. - Ensure that the block person cannot watch doer's repositories. - Add unblock button to the blocked user list. - Add blocked since information to the blocked user list. - Add extra testing to moderation code. - Blocked user will unwatch doer's owned repository upon blocking. - Add flash messages to let the user know the block/unblock action was successful. - Add "You haven't blocked any users" message. - Add organization blocking a user. Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/802 (cherry picked from commit 0505a1042197bd9136b58bc70ec7400a23471585) (cherry picked from commit 37b4e6ef9b85e97d651cf350c9f3ea272ee8d76a) (cherry picked from commit c17c121f2cf1f00e2a8d6fd6847705df47d0771e) [MODERATION] organization blocking a user (#802) (squash) Changes to adapt to: `6bbccdd177` Improve AJAX link and modal confirm dialog (#25210) Refs: https://codeberg.org/forgejo/forgejo/pulls/882/files#issuecomment-945962 Refs: https://codeberg.org/forgejo/forgejo/pulls/882#issue-330561 (cherry picked from commit 523635f83cb2a1a4386769b79326088c5c4bbec7) (cherry picked from commit 4743eaa6a0be0ef47de5b17c211dfe8bad1b7af9) (cherry picked from commit eff5b43d2e843d5d537756d4fa58a8a010b6b527) Conflicts: https://codeberg.org/forgejo/forgejo/pulls/1014 routers/web/user/profile.go (cherry picked from commit 9d359be5ed11237088ccf6328571939af814984e) (cherry picked from commit b1f3069a22a03734cffbfcd503ce004ba47561b7) [MODERATION] add user blocking API - Follow up for: #540, #802 - Add API routes for user blocking from user and organization perspective. - The new routes have integration testing. - The new model functions have unit tests. - Actually quite boring to write and to read this pull request. (cherry picked from commit f3afaf15c7e34038363c9ce8e1ef957ec1e22b06) (cherry picked from commit 6d754db3e5faff93a58fab2867737f81f40f6599) (cherry picked from commit 2a89ddc0acffa9aea0f02b721934ef9e2b496a88) (cherry picked from commit 4a147bff7e963ab9dffcfaefa5c2c01c59b4c732) Conflicts: routers/api/v1/api.go templates/swagger/v1_json.tmpl (cherry picked from commit bb8c33918569f65f25b014f0d7fe6ac20f9036fc) (cherry picked from commit 5a11569a011b7d0a14391e2b5c07d0af825d7b0e) (cherry picked from commit 2373c801ee6b84c368b498b16e6ad18650b38f42) [MODERATION] restore redirect on unblock ctx.RedirectToFirst(ctx.FormString("redirect_to"), ctx.ContextUser.HomeLink()) was replaced by ctx.JSONOK() in `128d77a3a` Following up fixes for "Fix inconsistent user profile layout across tabs" (#25739) thus changing the behavior (nicely spotted by the tests). This restores it. (cherry picked from commit 597c243707c3c86e7256faf1e6ba727224554de3) (cherry picked from commit cfa539e590127b4b953b010fba3dea21c82a1714) [MODERATION] Add test case (squash) - Add an test case, to test an property of the function. (cherry picked from commit 70dadb1916bfef8ba8cbc4e9b042cc8740f45e28) [MODERATION] Block adding collaborators - Ensure that the doer and blocked user cannot add each other as collaborators to repositories. - The Web UI gets an detailed message of the specific situation, the API gets an generic Forbidden code. - Unit tests has been added. - Integration testing for Web and API has been added. - This commit doesn't introduce removing each other as collaborators on the block action, due to the complexity of database calls that needs to be figured out. That deserves its own commit and test code. (cherry picked from commit 747be949a1b3cd06f6586512f1af4630e55d7ad4) [MODERATION] move locale_en-US.ini strings to avoid conflicts Conflicts: web_src/css/org.css web_src/css/user.css https://codeberg.org/forgejo/forgejo/pulls/1180 (cherry picked from commit e53f955c888ebaafc863a6e463da87f70f5605da) Conflicts: services/issue/comments.go https://codeberg.org/forgejo/forgejo/pulls/1212 (cherry picked from commit b4a454b576eee0c7738b2f7df1acaf5bf7810d12) Conflicts: models/forgejo_migrations/migrate.go options/locale/locale_en-US.ini services/pull/pull.go https://codeberg.org/forgejo/forgejo/pulls/1264 [MODERATION] Remove blocked user collaborations with doer - When the doer blocks an user, who is also an collaborator on an repository that the doer owns, remove that collaboration. - Added unit tests. - Refactor the unit test to be more organized. (cherry picked from commit ec8701617830152680d69d50d64cb43cc2054a89) (cherry picked from commit 313e6174d832501c57724ae7a6285194b7b81aab) [MODERATION] QoL improvements (squash) - Ensure that organisations cannot be blocked. It currently has no effect, as all blocked operations cannot be executed from an organisation standpoint. - Refactored the API route to make use of the `UserAssignmentAPI` middleware. - Make more use of `t.Run` so that the test code is more clear about which block of code belongs to which test case. - Added more integration testing (to ensure the organisations cannot be blocked and some authorization/permission checks). (cherry picked from commit e9d638d0756ee20b6bf1eb999c988533a5066a68) [MODERATION] s/{{avatar/{{ctx.AvatarUtils.Avatar/ (cherry picked from commit ce8b30be1327ab98df2ba061dd7e2a278b278c5b) (cherry picked from commit f911dc402508b04cd5d5fb2f3332c2d640e4556e) Conflicts: options/locale/locale_en-US.ini https://codeberg.org/forgejo/forgejo/pulls/1354 (cherry picked from commit c1b37b7fdaf06ee60da341dff76d703990c08082) (cherry picked from commit 856a2e09036adf56d987c6eee364c431bc37fb2e) [MODERATION] Show graceful error on comment creation - When someone is blocked by the repository owner or issue poster and try to comment on that issue, they get shown a graceful error. - Adds integration test. (cherry picked from commit 490646302e1e3dc3c59c9d75938b4647b6873ce7) (cherry picked from commit d3d88667cbb928a6ff80658eba8ef0c6c508c9e0) (cherry picked from commit 6818de13a921753e082b7c3d64c23917cc884e4b) [MODERATION] Show graceful error on comment creation (squash) typo (cherry picked from commit 1588d4834a37a744f092f2aeea6c9ef4795d7356) (cherry picked from commit d510ea52d091503e841d66f2f604348add8b4535) (cherry picked from commit 8249e93a14f628bb0e89fe3be678e4966539944e) [MODERATION] Refactor integration testing (squash) - Motivation for this PR is that I'd noticed that a lot of repeated calls are happening between the test functions and that certain tests weren't using helper functions like `GetCSRF`, therefor this refactor of the integration tests to keep it: clean, small and hopefully more maintainable and understandable. - There are now three integration tests: `TestBlockUser`, `TestBlockUserFromOrganization` and `TestBlockActions` (and has been moved in that order in the source code). - `TestBlockUser` is for doing blocking related actions as an user and `TestBlockUserFromOrganization` as an organisation, even though they execute the same kind of tests they do not share any database calls or logic and therefor it currently doesn't make sense to merge them together (hopefully such oppurtinutiy might be presented in the future). - `TestBlockActions` now contain all tests for actions that should be blocked after blocking has happened, most tests now share the same doer and blocked users and a extra fixture has been added to make this possible for the comment test. - Less code, more comments and more re-use between tests. (cherry picked from commit ffb393213d2f1269aad3c019d039cf60d0fe4b10) (cherry picked from commit 85505e0f815fede589c272d301c95204f9596985) (cherry picked from commit 0f3cf17761f6caedb17550f69de96990c2090af1) [MODERATION] Fix network error (squash) - Fix network error toast messages on user actions such as follow and unfollow. This happened because the javascript code now expects an JSON to be returned, but this wasn't the case due to cfa539e590127b4953b010fba3dea21c82a1714. - The integration testing has been adjusted to instead test for the returned flash cookie. (cherry picked from commit 112bc25e548d317a4ee00f9efa9068794a733e3b) (cherry picked from commit 1194fe4899eb39dcb9a2410032ad0cc67a62b92b) (cherry picked from commit 9abb95a8441e227874fe156095349a3173cc5a81) [MODERATION] Modernize frontend (squash) - Unify blocked users list. - Use the new flex list classes for blocked users list to avoid using the CSS helper classes and thereby be consistent in the design. - Fix the modal by using the new modal class. - Remove the icon in the modal as looks too big in the new design. - Fix avatar not displaying as it was passing the context where the user should've been passed. - Don't use italics for 'Blocked since' text. - Use namelink template to display the user's name and homelink. (cherry picked from commit ec935a16a319b14e819ead828d1d9875280d9259) (cherry picked from commit 67f37c83461aa393c53a799918e9708cb9b89b30) Conflicts: models/user/follow.go models/user/user_test.go routers/api/v1/user/follower.go routers/web/shared/user/header.go routers/web/user/profile.go templates/swagger/v1_json.tmpl https://codeberg.org/forgejo/forgejo/pulls/1468 (cherry picked from commit 6a9626839c6342cd2767ea12757ee2f78eaf443b) Conflicts: tests/integration/api_nodeinfo_test.go https://codeberg.org/forgejo/forgejo/pulls/1508#issuecomment-1242385 (cherry picked from commit 7378b251b481ed1e60e816caf8f649e8397ee5fc) Conflicts: models/fixtures/watch.yml models/issues/reaction.go models/issues/reaction_test.go routers/api/v1/repo/issue_reaction.go routers/web/repo/issue.go services/issue/issue.go https://codeberg.org/forgejo/forgejo/pulls/1547 (cherry picked from commit c2028930c101223820de0bbafc318e9394c347b8) (cherry picked from commit d3f9134aeeef784586e8412e8dbba0a8fceb0cd4) (cherry picked from commit 7afe154c5c40bcc65accdf51c9224b2f7627a684) (cherry picked from commit 99ac7353eb1e834a77fe42aa89208791cc2364ff) (cherry picked from commit a9cde00c5c25ea8c427967cb7ab57abb618e44cb) Conflicts: services/user/delete.go https://codeberg.org/forgejo/forgejo/pulls/1736 (cherry picked from commit `008c0cc63d`) [DEADCODE] add exceptions (cherry picked from commit `12ddd2b10e`) [MODERATION] Remove deadcode (squash) - Remove deadcode that's no longer used by Forgejo. (cherry picked from commit `0faeab4fa9`) [MODERATION] Add repo transfers to blocked functionality (squash) - When someone gets blocked, remove all pending repository transfers from the blocked user to the doer. - Do not allow to start transferring repositories to the doer as blocked user. - Added unit testing. - Added integration testing. (cherry picked from commit 8a3caac33013482ddbee2fa51510c6918ba54466) (cherry picked from commit a92b4cfeb63b90eb2d90d0feb51cec62e0502d84) (cherry picked from commit acaaaf07d999974dbe5f9c5e792621c597bfb542) (cherry picked from commit 735818863c1793aa6f6983afedc4bd3b36026ca5) (cherry picked from commit f50fa43b32160d0d88eca1dbdca09b5f575fb62b) (cherry picked from commit e16683643388fb3c60ea478f1419a6af4f4aa283) (cherry picked from commit 82a0e4a3814a66ce44be6a031bdf08484586c61b) (cherry picked from commit ff233c19c4a5edcc2b99a6f41a2d19dbe8c08b3b) (cherry picked from commit `8ad87d215f`) [MODERATION] Fix unblock action (squash) - Pass the whole context instead of only giving pieces. - This fixes CSRF not correctly being inserted into the unblock buttons. (cherry picked from commit 2aa51922ba6a0ea2f8644277baa74fc8f34ab95a) (cherry picked from commit 7ee8db0f018340bc97f125415503e3e5db5f5082) (cherry picked from commit e4f8b999bcd3b68b3ef7f54f5b17c3ada0308121) (cherry picked from commit 05aea60b1302bbd3ea574a9c6c34e1005a5d73bf) (cherry picked from commit dc0d61b012cfaf2385f71e97cda5f220b58b9fa4) (cherry picked from commit f53fa583de671ff60a0a1d0f3ab8c260e1ba4e1f) (cherry picked from commit c65b89a58d11b32009c710c2f5e75f0cd3539395) (cherry picked from commit 69e50b9969db3ab71cefaed520757876a9629a5c) (cherry picked from commit `ec127440b8`) [MODERATION] cope with shared fixtures * There is one more issue in the fixtures and this breaks some tests * The users in the shared fixtures were renamed for clarity and that breaks some tests (cherry picked from commit 707a4edbdf67d0eb168d7bb430cf85dd8cd63c52) Conflicts: modules/indexer/issues/indexer_test.go https://codeberg.org/forgejo/forgejo/pulls/1508 (cherry picked from commit 82cc044366c749df80ffad44eed2988b8e64211e) (cherry picked from commit 2776aec7e85850f1d7f01a090a72491550fb9d29) (cherry picked from commit 1fbde36dc784b5b2cc6193f02ff0d436b0f2a629) (cherry picked from commit 1293db3c4e5df218501f5add9f9d41101ffcb8aa) (cherry picked from commit 6476802175bac3ef78dd8f24ff6bebc16f398a78) (cherry picked from commit 5740f2fc830356acb7929a02fe304008b94a0ca5) (cherry picked from commit `afc12d7b6e`) [MODERATION] Fix transfer confirmation (squash) - Fix problem caused by the clearer confirmation for dangerous actions commit. (cherry picked from commit 3488f4a9cb1f7f73103ae0017d644f13ca3ab798) (cherry picked from commit ed7de91f6ace23a1459bc6552edf719d62c7c941) (cherry picked from commit 2d97929b9b7b8d979eb12bf0994d3f169d41f7fd) (cherry picked from commit 50d035a7b058b9c4486c38cd4be0b02a4e1bf4d9) (cherry picked from commit 0a0c07d78a1dee3489b97ab359bb957e3f7fb94b) (cherry picked from commit 85e55c4dbc2f513f3d5254dac20915e8c3c22886) (cherry picked from commit d8282122ad6e8b497de35d1ed89e3093a2cd5ee2) (cherry picked from commit `3f0b3b6cc5`) [MODERATION] Purge issues on user deletion (squash) (cherry picked from commit 4f529d9596ffbfc4e754c28830ba028f6344dc5b) (cherry picked from commit f0e3acadd321fcb99e8ea3e3ce1c69df25c4ca4d) (cherry picked from commit 682c4effe69dc0d4ed304fa7ce6259d9ce573629) (cherry picked from commit e43c2d84fd4b6fd31e2370cec1034262d12e5c34) (cherry picked from commit 9c8e53ccc78053026e4f667889959c23c8d95934) (cherry picked from commit `a9eb7ac783`) [MODERATION] Purge issues on user deletion (squash) revert shared fixtures workarounds (cherry picked from commit 7224653a40e32186892e89bfedd49edecf5b8f81) (cherry picked from commit aa6e8672f9473a9100e7575051dec9eda37709a0) (cherry picked from commit 58c7947e95648f50237ddcd46b6bd025b224a70f) (cherry picked from commit f1aacb1851b232082febcd7870a40a56de3855a6) (cherry picked from commit 0bf174af87f7de9a8d869304f709e2bf41f3dde9) (cherry picked from commit `f9706f4335`) [MODERATION] Prepare moderation for context locale changes (squash) - Resolves https://codeberg.org/forgejo/forgejo/issues/1711 (cherry picked from commit 2e289baea943dcece88f02d110b03d344308a261) (cherry picked from commit `97b16bc19a`) [MODERATION] User blocking (squash) do not use shared fixture It conflicts with a fixtured added in the commit Fix comment permissions (#28213) (#28216) (cherry picked from commit ab40799dcab24e9f495d765268b791931da81684) (cherry picked from commit 996c92cafdb5b33a6d2d05d94038e950d97eb7de) (cherry picked from commit 259912e3a69071c5ad57871464d0b79f69a8e72c) Conflicts: options/locale/locale_en-US.ini https://codeberg.org/forgejo/forgejo/pulls/1921 (cherry picked from commit 1e82abc032c18015b92c93a7617a5dd06d50bd2d) (cherry picked from commit a176fee1607d571b25b345184f1c50d403029610) (cherry picked from commit 0480b76dfeda968849e900da9454a3efd82590fa) (cherry picked from commit 4bc06b7b3841c74e3d790b1ef635c2b382ca7123) (cherry picked from commit 073094cf722a927a623408d66537c758d7d64e4c)	2024-01-15 16:10:53 +00:00
Gusted	c72564e3ee	[MODERATION] Purge issues on user deletion - Forgejo has the option to delete users, in which all data except issues and comments are removed, this makes sense in some cases where users need to be removed cleanly but without removing their existing bug reports or comments to an discussion. In the case of spammers, admins have the option to enable purging, where comments are removed. - Add issues to the list of things to be removed if purge is checked. - No unit testing, as this gigantic function doesn't have one to begin with. - Add integration test. - Resolves https://codeberg.org/forgejo/forgejo/issues/1268 (cherry picked from commit 3ed381c75826ffc6834fd54943f71579c060c16d) (cherry picked from commit 44d00650ce77bd4395892a62a64a90829578c81d) (cherry picked from commit 7f4da82779fa1d761b5fe045d3e0b4b2627638c0) (cherry picked from commit d629314def8e3e6d0f78184aa584fa57ece18bb1) Conflicts: models/fixtures/issue.yml https://codeberg.org/forgejo/forgejo/pulls/1508 (cherry picked from commit 794dcc218f2c0c53028aaf617407d46bddda57f3) (cherry picked from commit c433f2ecb60669e5c8748912b30c0433d5fe507a) (cherry picked from commit bb23683f4b10a504da677843bc2ae2b73ec299c4) (cherry picked from commit 634c5604d430b1b531467783bc70bb4efbee023d) (cherry picked from commit 219073f5c5558e7712039a83754f68b092689963) (cherry picked from commit 32893dbab139e2d238db8c3d7878321c6bdd0cd3) (cherry picked from commit `0ef40cfb5a`) (cherry picked from commit e535409cab3c276fd8db6b402f85934ef5127491) (cherry picked from commit 29059f611b5617d275737996b9e4076a3b0b667e) (cherry picked from commit cd480c5b8b99feed11a3797ab36a697cd0dcc91b) (cherry picked from commit 340e6573924dbd8d69843c69243e6b027c66f166) (cherry picked from commit 3a7a5564d02bde767cb14cbc30e3ca816808f7d6) (cherry picked from commit 1dbcaca726f3cbd777a4965b7414d6b60050ba54) (cherry picked from commit c491c439e28f04fdd0f002ec1403b19933afc7c3) (cherry picked from commit c8fe2140cc15dcffa9bb7c966493707ac23cdb74)	2024-01-15 16:10:53 +00:00
fnetx	1d9844bbb3	[I18N] Move source locales to other folder (cherry picked from commit d38ad85a05cb3547ad1c3f90531811aa9c78ca9d) (cherry picked from commit b94f9b8c1bdc62d7437c42c4aa333c7ed30a9b9b) (cherry picked from commit c728ce8b32b0ff52e14083d2118f6b1f233307ce) (cherry picked from commit 2911286336f93bbf6a6dec63cf62cb1514475eff) (cherry picked from commit bd4dc797c7cc599d2aca05b7d1ee2a6532dd0358) (cherry picked from commit 35889addf9ee26e084ff2f525e5fb078b5d261bd) (cherry picked from commit 9eaf321db44b70613e9f10e32f8e8628bd720610) (cherry picked from commit 7b64ef0c9b4dc1add73d91e126388cb835a3f472) (cherry picked from commit 6cd86bf244a29b888eb0218061aa95ee75ced790) (cherry picked from commit 275dd36f580c9553bc78dd1b7afb672c51e35e9f) (cherry picked from commit d5ace5a0ae27ad7c30ee5fff0f821cab4144979c) (cherry picked from commit c067466f8c28229228ae185267e228d552bb38e3) (cherry picked from commit 0d51a2228fe85c5ab097475987c4faf411df4658) (cherry picked from commit 4973e19dd3b043ce6de2a33d36dadbf4155a0075) (cherry picked from commit f553b4d54385439e3496a7890182b2a70d84a42d) (cherry picked from commit 18312a6f74f664021df7e3beb373ef1e368198ac) (cherry picked from commit d09dc97f8bdee6279ac9e47d4d45d241f9522251) (cherry picked from commit 10c552e54ed92bf7f68f64b202585a481780bada) (cherry picked from commit edf895e866469a3765a2b8cd6bbbd2cdd8c185a8) (cherry picked from commit 786a486cfcb481844b75da2ccfddf5853fc22486) (cherry picked from commit 2aa16d5cb9255693c8d2e7cdef854b75e2f7d499) (cherry picked from commit 1e940cf6cd3f6c64f7ff214b5dc8693b39854ecd) (cherry picked from commit 7355f3a65350ca325937d1ca715ac997ffb52c95) (cherry picked from commit e630328f5fad88b570e0e89f57183d436d856ce5) (cherry picked from commit 4f819cb97c74f727c6556979ab1826107697589a) (cherry picked from commit 3ffdabd3edd6775641c3989f7366a04bc2a9183f) (cherry picked from commit df4fb86007c29d08196c545b1b6f7eb77f1cd3ef) (cherry picked from commit 3826909cbb98e3e107b6fae06b4ad3369510286f) (cherry picked from commit d9825f7165e8e7cd025eb402df15f5f9d5a2bdc4) (cherry picked from commit 78ce758e6090ad2bfb5c9af1a591af9e086727da) (cherry picked from commit e94fb8986b6941ef0f1b203785571f4999242284) (cherry picked from commit 55043c590c9e4ce2131bd7f0be00c52689223431) (cherry picked from commit 432885ecc61783940a7da7a956017a5ab09a2a42) (cherry picked from commit 1f923c92f22a38063edd797a491a1ff109411805) (cherry picked from commit 3757f133877b9d3236e0516fb357476aa382eff2) (cherry picked from commit 2aae06ea3ec249d9ac0844bc7824daca617e5ffa) (cherry picked from commit 1eaa3095ce26a37b4a3c29d1cb742945b5b7ad91) (cherry picked from commit `16d95a8b66`) (cherry picked from commit `c1b4608baa`) (cherry picked from commit 1b3c486a8828e598da53374d5b1ea832d6b8b1fb) (cherry picked from commit 71375cb3cf4c18618bbe91aab1d8f2402f10c999) (cherry picked from commit 652902bf1f937d9eaf8f3694b671cdf798f1d449) (cherry picked from commit d09278409b10a3ab27a54c1426c49154e086384b) (cherry picked from commit ba38187b1202d56a148788fd810c17e76978566c) (cherry picked from commit 5a906e54d96cdbdc46db3e48b4b713f5105397f9) (cherry picked from commit d8a492750012a1364353419f7ef3e9138f8fc9cb)	2024-01-15 16:09:51 +00:00
fnetx	cd86ad60e6	[I18N] Makefile + gitignore (cherry picked from commit 68c744111d02a0cd93716a8f75442ad85f44243b) (cherry picked from commit 30d7c4a8998baf957b8a156789cc6601d4e87628) (cherry picked from commit 220ac0a6d3579da5d9c1a028cdd59511f3e97a88) (cherry picked from commit 21cb16af9502c0c14aae30eee3a65d4c14be3cbe) (cherry picked from commit 41a9373e3e78f050bb07ea475fdbf3261cf694b2) (cherry picked from commit 69030f7803c175706946af5fb8956d19aa7d2bec) (cherry picked from commit 92c4d4d2e6bf7f100feb5c85a9ae78afea2adbd8) (cherry picked from commit c1bfd1730e79c6c1720df99f367ddc030282f7e3) (cherry picked from commit 18a9a9e73cdea5bd501b10a2fde0d39be74d7f25) (cherry picked from commit 07f988207303011b3f645dc515ff855c0317507f) (cherry picked from commit e71b8061d4297fe2336cbf404046c1fdd8332fc6) (cherry picked from commit 225b30f1f77cd5edd06ca4a271a64029b0391d7e) (cherry picked from commit fdf98910039a98009e3c38be00db1785fe4292e7) (cherry picked from commit df2f4134764a4811a4f012193b93b2d1b8a2749b) (cherry picked from commit b01c755aaf634dd0f4c436ad90eda47f6e901afd) (cherry picked from commit acd4275acbada93b49c0baabfc5bd9db2ebbca6c) [I18N] Add Locale merger script (squash: compile on windows) Fixes: https://codeberg.org/forgejo/forgejo/issues/798 (cherry picked from commit b47b205e85f115b2493bd4c3a25c199196228d7a) (cherry picked from commit 1521f0bfd6747d0ad0d9c5e70c4c0b1d948e178e) (cherry picked from commit 7f988de42c6934105399985c7dd652ce81b79b3f) (cherry picked from commit d26b4913129e13c3afde69cd6c6db948e7789e3e) (cherry picked from commit 60136bac666f588179dbe1a9d98df0f82fcfb7de) (cherry picked from commit 915bb4b3542b14cc5f0e4d9feb3b8fa55a6d8440) (cherry picked from commit 3e1b42a8ca84a6abb81d4dfaf84ea7be383e7a37) (cherry picked from commit 18d8fc075fa6002fc1af0374005801cdeffc185d) (cherry picked from commit 1d9f95687b395df973e19d97294fca16b6f233e6) (cherry picked from commit e49da1a90d2358f18510d8e2e45448b24386f34e) (cherry picked from commit a182baed8a6a139dc473aa74797cdc404c206a72) (cherry picked from commit 3e48a87c0044b38dc8a9594c0dd14921a40f7e0b) (cherry picked from commit e0bb406c146408739f3140182082e910ac5b874c) (cherry picked from commit e45ec160f95f35a156423f98d7e8b0479184e197) (cherry picked from commit e89ec6d0086aedd0fddc2ee282b7a0f2c87b917a) (cherry picked from commit 80eb392c5c2c6e6decb7f99873c3dc7d6b300dd6) (cherry picked from commit d0bce1b613ab2c72c960f1e982b5cf7d60a7dfb2) (cherry picked from commit 8debcf86ea78cfb0e93eb720fb57f18641f1f65f) (cherry picked from commit a9bc3c54d721dbec8df640ba80f85cf0bfd5b36a) (cherry picked from commit d5595e4156cb7a613c1ff3cf28bfbfefa6678fd0) (cherry picked from commit 25cef0fad366af2faf5687fa95d445b43d28215d) (cherry picked from commit e4d15446ff34b2e9b624f3a8c6bdb9930e1b9b37) (cherry picked from commit `77ceb2a795`) (cherry picked from commit `61ebe5c536`) (cherry picked from commit 9377e1d1f25f773123abdf1b1665b765b2c503dd) (cherry picked from commit 7a90ba2922d9250adcbebffaf26d773805895e64) (cherry picked from commit bc65d42a836c16936e8327d47e8d20edd5d1ca3d) (cherry picked from commit 333f486015c8a05389c4aa70a23225f3719e5d43) (cherry picked from commit 0e90edaf12a2fc1241fb02cf398a0c8d316f6d7b) (cherry picked from commit 511d797ffbd4ef505d243bbb1c2cfba0d39a8b3f) (cherry picked from commit 2515b655ab6c7aa9fbb7a37023b1c77774e4a88e)	2024-01-15 16:09:51 +00:00
fnetx	987425d6de	[I18N] Add Locale merger script (cherry picked from commit ecc3dae2acaf567cd6b2888cc5c582588c7bfc53) (cherry picked from commit c6c3fc6ace6b6aa4f4877c5a96da54899f2dc2fa) (cherry picked from commit 4833bd594a49b70896c023b41da8a87ba33add0e) [I18N] in the home page replace GitHub with Forgejo The english string that shows on the home page to encourage for contribution no longer reference GitHub. But some translations still do. In this context, and this context only, replace it with Forgejo even though it may not be correct in some cases. Refs: https://codeberg.org/forgejo/forgejo/pulls/450 (cherry picked from commit 71de77f5ae59617eadda9e4992f1867a7acb7f17) (cherry picked from commit 0b5195e4e4ee1c4829d7f4e127cc48d5c0eb3d72) (cherry picked from commit 1252e83f8c7b22e06bb37622900741caa209e9eb) (cherry picked from commit 2ceb1b2b5faa32ca71716ed4c98d18b0942909e7) (cherry picked from commit 59233055b1a8e9bc79c5501d6e2c2649a6d1b26b) (cherry picked from commit 378ed6a21e0a57c3bb5211eb8ade4db499cdd7d9) (cherry picked from commit 2d661119c3b8a8278458005273f6a32fa3216050) (cherry picked from commit 2a95ff4107786bbf6c5b141a42e2efbd1bb897f8) (cherry picked from commit 012b5444a80cf2aaa61b2b65efebfe0691725422) (cherry picked from commit 2aaee4f7c4132af6f9a6e0d9aafe0218603b8a5c) (cherry picked from commit 52b3f53cb7dfc86a1287baa40f5f5b6dce946a27) (cherry picked from commit 24e665abe748ff34163e7c870aa0b90ffca86c26) (cherry picked from commit 335f8b2bd1971ce3b39b57b2cfd6d8c9af85ab75) (cherry picked from commit da3890938b7a13a467520fccfa6187376eab3050) (cherry picked from commit 5d0cdd5fe228906d378152b2472f7399fa9e3c45) (cherry picked from commit ed8e299b59e903f025cbbae8769e10678372b4b8) (cherry picked from commit b38db49888a6f627ab6c440899c0f6ccc3d55979) (cherry picked from commit c19cb35acf947153458707d8431153b8f3de0cf1) (cherry picked from commit 45fc0e2dda954d57adab7c3fc261c4e89e9f010d) (cherry picked from commit e7ef7c26d1883977684cf2ab576743c3d4f2f19e) (cherry picked from commit 11d05b0dc5b4dac8b2f6bad6e1f02e32d93f1704) (cherry picked from commit 8f7287337e7f316191c78aff01fddb3fc04ba2bb) (cherry picked from commit 8351803ee197a18d1faf84765ce55ed9b7498f9b) (cherry picked from commit 0ebf3c0fc73577e4a6fc379efb0164836943644b) (cherry picked from commit 749d3b4f68db8fc6d1eca61d6b0eeb3b40b20e63) Replaced gitea links with forgejo - protected tags, webhooks (cherry picked from commit 12534649d06af0ac518714dc28916ccc08a5a87c) (cherry picked from commit 5ad3ff69d41502dd8b3ac5cd30729353683c4316) (cherry picked from commit a7a325b3f5de8fca6be552e0c98a5125858a8e0a) (cherry picked from commit 31d2cc455f5339fc78de08237b49e4c6200a27e9) (cherry picked from commit 99b71abfdb4a000f1081fca988bc5295cca18473) (cherry picked from commit b096317ac9a2436e5c1563c44c5aee4be6dd2f5d) (cherry picked from commit cbc5cfdfd690278a17f034c2b00d4b48cafba977) (cherry picked from commit 1c99fa3f709e2ffce36c135d098971152154b7b4) (cherry picked from commit abf26758f4c09fb411d35a7494eddc675b9ba154) (cherry picked from commit ccf53ef1d693bf26d4d12955e2543683d1f81654) (cherry picked from commit 9287916ac8f1a492a6d65a0c46135a6c180db7a6) (cherry picked from commit 1f646e43ef6713bdfa233f93b294c4656e62428d) (cherry picked from commit `162873dff6`) (cherry picked from commit `c41533138d`) (cherry picked from commit 6bd8b1aa61204cc6bc0f2ae09cbfbe9754ab4085) (cherry picked from commit fc2decb959854690c0bbeb08e6648d62a72d8da6) [I18N] Add Locale merger script (squash) abort on NOOP If a string is no longer used in the english version of the locales, it means the Gitea string was changed and it needs updating. Abort when it is the case and recommend action. (cherry picked from commit 34f3d7d65e982b729bb878dde04c8a1093885ed6) (cherry picked from commit 666aa258adcfd16276763f32ab1b58b9e817efcc) (cherry picked from commit f9655eebeb56d28abc3b576ceb828c76fc8c73f4) (cherry picked from commit f6979b0aacdda5d3295cb9f4d8a045ebd9abdfb2) (cherry picked from commit c3c62bea76c87b45fb709a0bef144e3a971e763a) (cherry picked from commit d69cab8b95e57b4709f515acf9ee3226b2833f3e) (cherry picked from commit 521184d6a6887a8b48a4266ebe480e246c51eb18)	2024-01-15 16:09:51 +00:00
fnetx	54dd7d13a1	[I18N] Rename upstream files (cherry picked from commit 2d67a9a62163957eef9dd26379a229b8af741655) (cherry picked from commit 4eac51f6a4200e01aa72fa0eaac5d72d57ed0c8e) (cherry picked from commit 34401a28f5d1180ac580c3410209b5291428a156) (cherry picked from commit 7210b45a61f52b3c6396c339dc525d5b58c32b54) (cherry picked from commit cc741116d2e1423d005869b244054b41b402dc3e) (cherry picked from commit 67a160ef0abca208610d1395a2218aab26c181a3) (cherry picked from commit adb258767259f3e8802485990a0625bc151f364b) (cherry picked from commit 1b57a3d6011d4b9790199cc1beb4d2220f45bb09) (cherry picked from commit 02fbbf05384190ca3f81e6bd920e3cbe2a9cd260) (cherry picked from commit 164af88c4b002cc8fcaaba0551608a25236a836d) (cherry picked from commit 5102d0aded75df2d171fbc9d5763f5918663fe7e) (cherry picked from commit f1e1e620f475d2935c2cb487574af93a5e9bb90e) (cherry picked from commit 2bd4ab7b4635fff63552c003782f05e63fb84f3d) (cherry picked from commit 28b511a33a2b778cf456bfaae02dc431d3c4d48e) (cherry picked from commit dc501ba1c160ed5c401c9e21fcfddd21ee00254d) (cherry picked from commit 252d336537286da57ec486cb43906c026c72943a) (cherry picked from commit 8208f11db036e2d80b28a03d523f766ed69bfa43) (cherry picked from commit da711c70b59b1d464a773be95a67eee3360ec6a4) (cherry picked from commit 62e9a4d9179dc11cb9752fc327fb5788a259b5a2) (cherry picked from commit 7fe6e090735aa1df498c0b2b9a63b983906fa7ec) (cherry picked from commit cfd6782313db3e1de219b5cd9d64a556234ea2c9) (cherry picked from commit 5188e3a0f1eb502b4b6266a828cd06a8ec748a77) (cherry picked from commit 5d741ae4406ddf04126e689d6320ef29b84bfeda) (cherry picked from commit b8a72e0111ddc03c583daf6432dd6aa3e507c4f9) (cherry picked from commit 2fbbf1ef8d4342260eede975e42264a8fde072bb) (cherry picked from commit 33597ea6c0426c7d218e5fd3511e0582e9e3720e) (cherry picked from commit 966e0cf8c01a23a7d58583214389d22d96900cd1) (cherry picked from commit 38d0da916793d4e420f068bb934c5143292177f4) (cherry picked from commit b740ebf5f6a4db0a802abf7ac1f731ca82b30bc6) (cherry picked from commit 36e0978f6e2bd59a20752063480f1c85c07947ab) (cherry picked from commit 98e157c22223b7e4f3dcad34824e7430104848a0) (cherry picked from commit 1ec680eb7fbfda59bf6336ad83cfdfc98759f205) (cherry picked from commit 23848b7ce739557cafd9f6aece789f10b7f308da) (cherry picked from commit 431c925de486848a15b48d5bf8cd5af30ce1fb50) (cherry picked from commit df9e026d9239f839ac0b8fd35614325ba183e468) (cherry picked from commit 39d97780a109aeee81fe230053e0c43b68572b93) (cherry picked from commit 7e266cce10d71dc443904668de41bfd226c99003) (cherry picked from commit `516de5fd8f`) (cherry picked from commit `1bd5eba7e7`) (cherry picked from commit 45d01bcd389933a29a66ed237828a7b23bc87752) (cherry picked from commit 71734355d0db1c3af671f7d37d09264a6626feed) (cherry picked from commit 6a1a33c34c6c4467cd305bd9ec44a39cf1e93cf2) (cherry picked from commit 829715aa21be078424a44f623bbbf62831fb7972) (cherry picked from commit 7c06b5f9ea1efc569e4757d9ee76ece3b80c96ff) (cherry picked from commit 90ab1b3c6294a9050c98be73a14db78e810fc180) (cherry picked from commit cf6b103868913aec5f6795a268c74e3f07e7f760)	2024-01-15 16:09:51 +00:00
Gusted	f497ed30cf	[PRIVACY] Add a DNS method to fetch new updates - Use TXT records in order to determine the latest available version. - This addresses a valid privacy issue, as with HTTP requests the server can keep track(estimated) of how many instances are using Forgejo, with DNS that's basically not possible as the server will never receive any data, as the only ones receiving data are DNS resolvers. (cherry picked from commit 0baefb546ab96bc3c06d90feffdb14873c2c2a3a) (cherry picked from commit e8ee41880b775532e6a68bd2052ed96d369dee78) (cherry picked from commit 7eca4f3bf1faa3f063c9668d1bb354b842361007) (cherry picked from commit 6dde3992dc504f105f2285c34fa6445fa24da0b1) (cherry picked from commit fb3a37fbfc73d35e3ba8d793b6051aeddcbb0634) (cherry picked from commit 8304af1e9d94b89ee700b0d454d74d0dc5cfac64) (cherry picked from commit 0543a7d12a4bac012db8b9e683e879e6f265a9dc) (cherry picked from commit c3a22933b7ca8201c96267d360281848fb2a1c7e) (cherry picked from commit e24370769413aebe96ba6cfb230da3c2c33e39f4) (cherry picked from commit 7eb6d1bcf7a0bdae0cbbf06136854d0b29c54899) (cherry picked from commit 1d7b9535cd73bffda5defd143c25e514cc55dee8) (cherry picked from commit 05920dce67808ae346c4e9cd9a41c9942e857bc6) (cherry picked from commit f173f27d7c3bf36c54b7e715a61b2308d1b0d277) (cherry picked from commit 90e1c9340e72f08e67293647cf5f19b3e3571909) (cherry picked from commit de68610ea70b81146f6412e42d72b97aad0428ae) (cherry picked from commit 8d5757ea0459cffeb885462b7a9d1e1c630e1f16) (cherry picked from commit c7a7fff316c1a88ba9b0984114a25cecfac56bce) (cherry picked from commit 39ac8b8fc164090eacd5870bf78ea863d2add5fa) (cherry picked from commit 98892033012ccc4f4bef30e10932fa22bf12ebcd) [PRIVACY]: Adjust update checker description - Resolves #323 - Adjust the description of the update check function on the installation page to describe the privacy method instead of the HTTP method by checking gitea.io (cherry picked from commit 61eae5b105e374169fe23fbb150ce080f8f340ec) (cherry picked from commit 091def20a1180af718209f2bd520cb249b1943ae) (cherry picked from commit d5d11bf45a77cad6be2194620c4d865231cfbe67) (cherry picked from commit 71863d470739c743335931f1563e5b63cf3194eb) (cherry picked from commit 11ece4aab1ba7a154e985a6732c6839d8a688315) (cherry picked from commit afdd7e714f9e735811dc909a854cfac964e474e7) (cherry picked from commit 39170e2f1d64d79bb05940b72d7db602bcff1bce) (cherry picked from commit 4b3a52aab82e8b9f59f247983a4aa7de65c6c747) (cherry picked from commit 9d763c5fc8cd0ff7898855e1ef088edb264388d5) (cherry picked from commit 638db15482f6907fa21e27aaccf6795226ae60c0) (cherry picked from commit a52bfdd8e76466aa293855a35c6ac9e18a228e90) (cherry picked from commit dc93d00e85dfdd9c090294f5504b8d885a602c60) (cherry picked from commit 0bc4b3508c8d2e49b57d47b4c5b36a9365580a1b) (cherry picked from commit 3f760d85a45520d3340bf27efe667fc689b6b8ce) (cherry picked from commit ecc2716785036b5538c8022d1c4dd6156796acef) (cherry picked from commit 6334d5677eb3e1848ab16630a22ae59ab716a732) Conflicts: modules/updatechecker/update_checker.go UpdateRemoteVersion now has a context argument. However, in the updated code from Gitea the context comes from the HTTP request and does not actually provide any useful context. Replace that with context.Background() (cherry picked from commit ca2200767edb9c30b655b942824957577b1f6fe7) (cherry picked from commit f46feca224d388e92875a76c8d2428c2681ad0c5) (cherry picked from commit a800a66ca89c03a8e08f26f633bea8634cffe629) (cherry picked from commit `21f017454e`) (cherry picked from commit `762d18e09a`) (cherry picked from commit 6d28e120c131b2547a87691a6195205cedfac052) (cherry picked from commit 4fcd7e7cbf55d7b69568a931fc86b3aef8346adc) (cherry picked from commit 95162851128ef1d03435bd5e011748dc3d0f26f8) (cherry picked from commit 0dd752a2624693fb1c9c4dd0efa8e343ae1ad3c7) (cherry picked from commit b1f1af7fe03878c333966b2f4c6581ab0e6c2593) (cherry picked from commit 71937deaa575015fb5e9073a014b4fba74ed92a8) (cherry picked from commit 93e41a782334b7b53198da89e1c8a92bb9e6b6be)	2024-01-15 16:09:33 +00:00
Gusted	70daffa9fe	[PRIVACY] Disable `update_checker` cron tasks - This is being disabled as it will weekly connect to a domain. - This only affects existing installations, as new installations will have a explicit value being written into app.ini due to https://github.com/go-gitea/gitea/pull/21655 (cherry picked from commit cd0b8b6852563118ab8530c01a48bc612efcf58a) (cherry picked from commit 58d43867cab15a4b93fab6f4b467756e8030fb2d) (cherry picked from commit f290b91e504933be83d5b9540a195173280ab38d) (cherry picked from commit 5bd6d7555478713c91a3c00980060041ed34ba22) (cherry picked from commit e5d0abb59244809f5181dfbadfbee47531246a18) (cherry picked from commit 4b381ce77e699ce9f0f8af8ac3488bd8e3562b15) (cherry picked from commit b6a9b1390d9ee3aa70d50b1fae1346aff69cab08) (cherry picked from commit 367436287118b0fc4030ee6527d6c366db919594) (cherry picked from commit af0f606fc1f42be49dcbedd04055f0f9a0b7d3df) (cherry picked from commit 49560da6fb01cd6ee1a69840f48ed9269330c37a) (cherry picked from commit ca06e27c5b7b8b20e34935885c4ab0ca905b9157) (cherry picked from commit 163df86df5abdda11b6d337af32e0f0f3837119b) (cherry picked from commit 0391c6ae42eb364a6db1156af93304aa73c69b2d) (cherry picked from commit f282f2d42fd850c29b489d02133698e14b21f411) (cherry picked from commit 68d31cf2478626730324eaa56ad4264580b7030c) (cherry picked from commit cfd4a479e95597f315d9d75e2b7d22c8f6941ce2) (cherry picked from commit add969bdf624df9eed3047d60a1bae979e9bfd80) (cherry picked from commit c0f3f1f1e733b6df0f028a1393549adf7f8936f4) (cherry picked from commit f11dca9090a77dbd58ff980e97cff07a5b2d27b5) (cherry picked from commit 283810387ff26fbbf1ac795d56350a7bfb87b874) (cherry picked from commit 08af1f0ea882bbe3fada3e61988baa9f0d290d1a) (cherry picked from commit 1c1a6da319f9218cc05693e0b8461f3defe1d891) (cherry picked from commit c1444bae65daa29497209a0bcc0758b1af9828a0) (cherry picked from commit 6361df634bd8fda81793e35820f0a42c56e5e55a) (cherry picked from commit cc8bb3f94605858c3ff9412644d90d80150c3f23) (cherry picked from commit c7ae4411fd041dde1c73a5fdc64679317b6daef7) (cherry picked from commit f73f4eef02c41430cc6a7375fc3b73aab8b75de7) (cherry picked from commit 2122896e8529db6b6158bb9029492f8f5e12efb7) (cherry picked from commit d469c99671cf6a5a8087b1ad106a04b43f4edc85) (cherry picked from commit 41dbbd731edf52c1c78d34cba1dfd7e03029e5f7) (cherry picked from commit e8e742b4376ab2437097a94a5f541576f9da3c81) (cherry picked from commit 0fa9f87b5fbb81b9205650da918bab02c7f86916) (cherry picked from commit a92c724a563e0260425cfe8569dec893740b8c71) (cherry picked from commit 6a18d153e1f60bdac04a568eaa2d74cb2c1d5cb1) (cherry picked from commit 0dd35a13fdcf34f88b9cc554646402b1bb40da57) (cherry picked from commit 5ae0cbe0ae98c7e12666f185aa5da21160ab83e8) (cherry picked from commit 13bd3cf37bed863491f1284572fa0bfa470b8ec0) (cherry picked from commit `a163efa6cf`) (cherry picked from commit `422a6e8329`) (cherry picked from commit 125fb33e1baad8bf88d71db5bffaa898c38565e9) (cherry picked from commit fd39d15a921c726f593a55ba0c4eae6f8f78a4a0) (cherry picked from commit b58147451372d354a499f6b38d2662ff6c74c132) (cherry picked from commit 987d19852364fe258b4eaddd9df51245a082522e) (cherry picked from commit f06eed025fb73ca1ebe7eb65cbd5ab5c3276d981) (cherry picked from commit 6f9f4156448e7b9eb9d7c7776eb20b0ab5de692c) (cherry picked from commit eb2c878debf07ad46e272ff8e2adfa414657f4c3)	2024-01-15 16:09:33 +00:00
Gusted	fbe8d65f0b	[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	2024-01-15 15:45:14 +00:00
Earl Warren	2f80066217	[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 `2d75f86f0e`) (cherry picked from commit `29119a870f`) (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)	2024-01-15 15:45:14 +00:00
Earl Warren	9f76193ea4	[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)	2024-01-15 15:45:14 +00:00
Alex Syrnikov	5b0125591d	[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)	2024-01-15 14:48:04 +00:00
Gusted	41c9a2606b	[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 `9fbe28fca3`) (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)	2024-01-15 14:48:04 +00:00
Gusted	9220088f90	[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)	2024-01-15 14:48:04 +00:00
zareck	af15c5a60a	[TESTS] add TestAPIForkDifferentName Refs: https://codeberg.org/forgejo/forgejo/pulls/1719 (cherry picked from commit `ed34138915`) (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)	2024-01-15 14:48:04 +00:00
Gusted	dc80ba9a97	[CLEANUP] Reuse ForgejoVersion variable - Resolves https://codeberg.org/forgejo/forgejo/issues/1226 (cherry picked from commit `e383b70109`) (cherry picked from commit `029cfa34de`) (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)	2024-01-15 14:48:04 +00:00
Gusted	8195ba06d5	[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 `b5ea6e85ac`) (cherry picked from commit `5915f3643c`) [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)	2024-01-15 14:48:04 +00:00
Earl Warren	87c65f2a49	[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 `5110476ee9`) (cherry picked from commit `77ba6be1da`) (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)	2024-01-15 14:48:04 +00:00
Earl Warren	10a1bf8122	[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 `64fcb25de3`) (cherry picked from commit `740943d6b0`) (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)	2024-01-15 14:48:04 +00:00
Earl Warren	66af8f2ae8	[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 `a0abe20b1b`) (cherry picked from commit `6f5c2f902e`) (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)	2024-01-15 14:48:04 +00:00
Earl Warren	ef139ac06f	[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 `06a47ea56e`) (cherry picked from commit `5a4d56e77b`) (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)	2024-01-15 14:48:04 +00:00
Gusted	9bca34ef03	[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 `6d882ede35`) (cherry picked from commit `7c8d754ac6`) (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)	2024-01-15 14:48:04 +00:00
Caesar Schinas	bc02f05346	[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 `861fb8ee61`) (cherry picked from commit `aeb6f7a5fc`) (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)	2024-01-15 14:48:04 +00:00
Earl Warren	0fef12f5d8	[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 `8c5d8bfea0`) (cherry picked from commit `2817ce027c`) (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)	2024-01-15 14:48:04 +00:00
Earl Warren	514a631aa6	[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 `eadbbb1afe`) (cherry picked from commit `db22d61eb4`) (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)	2024-01-15 14:48:04 +00:00
Earl Warren	8ce897b3fe	[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 `11717b864b`) (cherry picked from commit `b70f3e0fa5`) (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)	2024-01-15 14:48:04 +00:00
Earl Warren	440b8c1af1	[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 `0285c99774`) (cherry picked from commit `0527bb20db`) (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)	2024-01-15 14:48:04 +00:00
Earl Warren	0cd9fe5251	[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 `f83f0f9feb`) (cherry picked from commit `fd1c3a6d09`) (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)	2024-01-15 14:48:04 +00:00
Gusted	e556074abd	[DB] forgejo migration v1: add blocked user migration (cherry picked from commit 66afddd511d2821f648919925ea365cd085e4e77) (cherry picked from commit 19da0dee9df87cb946d1c8e25b917f7283d95302) (cherry picked from commit 0b725af693828bd7705b09433fb25d974fbb820e) (cherry picked from commit 64d4de2b664a9f406b2927c6e6b465ee2b3a8915) (cherry picked from commit 05bc9d3b7f8d00a37b41615f9caccca84a98c0ee) (cherry picked from commit 5958553066d275c767018454fbed9470c2cf473d) (cherry picked from commit c4f77e26c913eb3293bc702e1c65e2d09757cfe1) (cherry picked from commit 3034832c6637965bf70c766d9169ca3c28c27cd3) (cherry picked from commit d48931ec5b677989f8b2ef91752b2e3ef25ff2a2) (cherry picked from commit b1e0d53c28369666367e2629b4226338a111e0e2) (cherry picked from commit e3de35fe15c33d87f1a33e193fa7e038c5e3a724) (cherry picked from commit 3b2712c3d6bd0884166787e8c257305d54247112) (cherry picked from commit `00c6940851`) (cherry picked from commit `ac56c7a202`) (cherry picked from commit d957fb66de9bb8d04cf184c88b4a3ca2ab7728eb) (cherry picked from commit 01e9125f1b172c8a78a380c611d2244df104178f) (cherry picked from commit 71675caecb545cda069d766f16feb6bd6924e9ec) (cherry picked from commit 0313d02e50ee64729fdd3aa661b481ae5d32c029) (cherry picked from commit d2952769c1217b984936a1bf6a0d4f072217e122) (cherry picked from commit 63d080cdcfcaac34aa5a3040e00d33506224c112) (cherry picked from commit 43ced29b28c2631d0d5ec7320ab7b40d9f8e06c9)	2024-01-15 14:48:04 +00:00
Earl Warren	b5001edeea	[DB] forgejo migration v2: create the forgejo_sem_ver table (cherry picked from commit 86b26436af85e0eedb732e115e8be024e1d54ca6) (cherry picked from commit 479cba59aca2b3b73a83e5acc0b754906230f0b2) (cherry picked from commit 4765f9a889ce7324416b51e7d4524b2368459752) (cherry picked from commit af771410bfaa511bbc97cbfeefbb279b3836158d) (cherry picked from commit d1ea9305d8d653d637cbde6d383c095bdc4991f0) (cherry picked from commit f77e1bb7abd6054851b811fc0d71bf0130085353) (cherry picked from commit 0b95f8fe899ce14e19e5aeccd3e53e21b8bf8fc1) (cherry picked from commit 4f8fb2390a415d2f9319c9f23ff653c31efd2409) (cherry picked from commit 8ea0e22ff6e09f1e46d9a10f1325f7c6997c018b) (cherry picked from commit 43ac19ac59044210906c96857194231ca7804c92) (cherry picked from commit 0d2f63df4f9579c62ed21c807c53e689b1c71dbb) (cherry picked from commit d02a8036fda2bfcf8791366198e25735547d6b3f) (cherry picked from commit 1fe4c7db941b892df38be12249d4898248ff016e) (cherry picked from commit `d641cdeaf0`) (cherry picked from commit `10e8a4f8b8`) (cherry picked from commit 8097bc40b3f90ed959adc9edd1982e5867856397) (cherry picked from commit ee5cb37d7e9567c129fcf2a606175d425dacace1) (cherry picked from commit 26d93b8e49270440a940cd2e12b36c449644af94) (cherry picked from commit bc73195e5945a89bedb2faac579eac2cc403195e) (cherry picked from commit a763fa5de29e6e5986e0f4971e0a9696aa98a024) (cherry picked from commit 4b000cb435b1ddec2aee901b9d257e0af87b7698) (cherry picked from commit 9f6d20e73f73fefd78e64d8fc11af9118bef9557)	2024-01-15 14:48:04 +00:00
Earl Warren	f76d5e0a82	[DB] run all Forgejo migrations in integration tests The tests at tests/integration/migration-test/migration_test.go will not run any Forgejo migration when using the gitea-.sql.gz files because they do not contain a ForgejoVersion row which is interpreted as a new Forgejo installation for which there is no need for migration. Create a situation by which the ForgejoVersion table exists and has a version of 0 in tests/integration/migration-test/forgejo-v1.19.0..sql.gz thus ensuring all Forgejo migrations are run. The forgejo.sql.gz files do not have any Gitea related records, which will be interpreted by the Gitea migrations as a new installation that does not need any migration. As a consequence the migration tests run when using forgejo-v1.19.0..sql.gz are exclusively about Forgejo migrations. (cherry picked from commit ec8003859c920ac05a071ad9b1d9d8af5a694ac0) (cherry picked from commit 697570ff390656930d41bcdc4194aacc5c7a54f4) (cherry picked from commit f041aec17265ca34943f961d9640e60c96c0f24d) (cherry picked from commit 60463e3bab9dfa6aae7f379fc77309ab52b1d250) (cherry picked from commit b2fc2a7c1338ad2a9bd0a6887443e604dccda53f) (cherry picked from commit fb2759b6afc213d5e2db8f6e523391927c611b23) (cherry picked from commit 37cfc3b2275afd523f53e149781d69a2914fd83b) (cherry picked from commit 832607500a576a40ee1e35897e58ef319dba9788) (cherry picked from commit 143d4007b1b60ad1880b64ce1d4998e77854a05a) (cherry picked from commit a17e803fbfb7908729c2d92fd58360806cce6fbe) (cherry picked from commit 72ffd49bc3c218acf8c87f7464f2c028860adba8) (cherry picked from commit 9b92a5fd725b34d7ed18b5f1ebc78e1a45de07eb) (cherry picked from commit 0a334d0a9b02617360aaa76d55dbb0f6fd5547f4) (cherry picked from commit `3add683c94`) (cherry picked from commit `8ed3f3f86b`) (cherry picked from commit 97dc65852b215d85c8608033bd4180d91aef1a54) (cherry picked from commit e0503cbfead8e5f7f48d0eb0f32bd6881437bb9b) (cherry picked from commit f25e6a196b32dcb500fa7df65f21124e5e6a10c4) (cherry picked from commit cca19c7a4e35982c5fec4de4fcb53690f22d1212) (cherry picked from commit 2c89d7f18c9493e720e0d06c4b2cd072445eff47) (cherry picked from commit 4eb8695c40e5d1c64113ce19bb3deae1eafe64c9) (cherry picked from commit e4c42a68ffccb83fcd7379baa402daae15d6f57b)	2024-01-15 14:48:04 +00:00
Gusted	9183cdc835	[DB] Forgejo database migrations - Implements https://codeberg.org/forgejo/discussions/issues/32#issuecomment-918737 - Allows to add Forgejo-specific migrations that don't interfere with Gitea's migration logic. Please do note that we cannot liberally add migrations for Gitea tables, as they might do their own migrations in a future version on that table, and that could undo our migrations. Luckily, we don't have a scenario where that's needed and thus not taken into account. Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/795 (cherry picked from commit 8ee32978c0af1f8f71679c87f695df2b90b617c8) (cherry picked from commit `c240b34f59`) (cherry picked from commit 03936c649243a0a29701393d58e63e33064c7461) (cherry picked from commit a20ed852f8b6d28872c05d688bffe5c6976bfa03) (cherry picked from commit 1dfa82676f1feb745633618fde2d362bf19c4f28) (cherry picked from commit c39ae0bf8abced8fd5dc32589e68515ac308b69b) (cherry picked from commit cfaff08996c9f42592c95a63fe907b45b8a9317a) (cherry picked from commit 94a458835a2b0336b26c1c9df64fdfe2de47f496) (cherry picked from commit 61a3cf77dfe3f612ff110eb19f94dcb08051daf1) (cherry picked from commit abb350fde879cc495761dc4616b7aa0fc5d94d54) (cherry picked from commit 5194829d6b4ed702cf50ff875da57d04d77c8a18) (cherry picked from commit 89239a60f23cad7dad03add744e23a4f3b10d6a4) (cherry picked from commit 683cfd86efc5fa8cc04973ce3115351515a20917) (cherry picked from commit f4546cfed92844e3666b80130eadabb9348b88ae) (cherry picked from commit 86614d5826392b3fbe68355baeab9a0a761883a5) (cherry picked from commit e4b9c32187a039a83686a82856a9a192919c6e82) (cherry picked from commit 8c253719afa9b82f169757df007587d38560c06d) (cherry picked from commit 857365d6c15b5471d63662b1d89d1523151c4f79) (cherry picked from commit a488b3952f58bbf28bfa101a24e52dad7c9662eb) (cherry picked from commit 98313c49109c941426beecc1a3e7887f28b99970) (cherry picked from commit 430d95e8240971e266705d2e7202a5c785379cb2) (cherry picked from commit 08bf9d918fbb67f5ac06c0cfdc24229aa14ff83f) (cherry picked from commit f8a170e2d042fcb8f314e123de6918317ac1e909) (cherry picked from commit `d20e325378`) (cherry picked from commit `6c0aa7dd4f`) (cherry picked from commit 46c08c26c7bd3260b3ac7678f24566b467f4a2fb) (cherry picked from commit 9ee22153c4ec62392693c9151d5395221d097f70) [DB] Ensure forgejo migration up to date (squash) - Hook Forgejo's `EnsureUpToDate` to Gitea's `EnsureUpToDate`, such that the Forgejo migrations are also being checked to be up to date. - I'm not sure how I missed this and if this has caused any problems, but due to the lack of any open issue about it it seems to not be a big problem. (cherry picked from commit 6c65b6dcf6ab0d58e5c2d03a866e4e38294f72ad) (cherry picked from commit 6d45c37d843147e69b0a27ebe35c617d7f574b76) [DB] Add test for TestEnsureUpToDate (squash) - Add a test for the behavior of `EnsureUpToDate`, to ensure it will error when needed and succeed when the forgejo version is up to date. - Add forgejo_migrations package to GO_TEST_PACKAGES, to avoid running it with `test-unit` and instead test it with `test-*-migration`. (cherry picked from commit b172a506914fee40a50daa51f0c8e547427fd2f8) (cherry picked from commit d8af3088205b592340fd836135ffe97da9cec5a6) (cherry picked from commit e69e64a32c5e38247e94ab880536e3cfeab67cc6) (cherry picked from commit 4e8363fad4e08845960912a3ea3fe7265ee60602) (cherry picked from commit fc9ecd6c533eca864503423cf4a21710984a6b75) (cherry picked from commit e5c446e3dc9bc6e9549862f7b764a634f4fbaaae) (cherry picked from commit 7066a15655a33f57ccfb68cf2cb994ea57ad3666)	2024-01-15 14:48:03 +00:00
Panagiotis "Ivory" Vasilopoulos	7b5ad0c13b	[FEAT] Use OpenStreetMap in USER_LOCATION_MAP_URL by default Follow-up to `d58c542579` for Forgejo. By default, Gitea does not select any map service that can be used to introduce a 'Show this place on a map' button in the location field of a user profile. Before I tried upstreaming this change to Gitea, this was the case in Forgejo. This patch essentially recovers this functionality, which is nice for public-facing instances and communities. Links to original PRs: - https://codeberg.org/forgejo/forgejo/pulls/1076 - https://github.com/go-gitea/gitea/pull/26214 (cherry picked from commit bb187d5f617f8efceb41810d6ff9adcaa60450bb) (cherry picked from commit ce02ef9078a8731921caa4f7b0c1b0ac3b59a784) (cherry picked from commit 6b75c40e2575e23810880ee8e368dc1781e2b4e4) (cherry picked from commit 6bc8e9f5737f5721ddcd1ef5926a778a7f66a4a3) (cherry picked from commit 063f8afdf7c2cca014c60dcc3d78d270fd236f8f) (cherry picked from commit c5cc736b72e1ba980519e9258686f41e4eb78b42) (cherry picked from commit 7b1bb4bedc6196fb6e8516d9a34092b16d7fab05) (cherry picked from commit 2a022dceb4b391e2fc25b077193ae22a71380eee) (cherry picked from commit a946c142d2448cb92daaea11851cf7f00921f062) (cherry picked from commit 8a4ea0c7ab8960f41a67442fa2f485fe0a901a96) (cherry picked from commit 37bfb05b34e61194afe407acac5778258315b756) (cherry picked from commit 12fbbb1754a1a836f6923431e47a5de95aec6b2e) (cherry picked from commit abe9de2cd91d7c5f176ceddff20ce194439703c4) (cherry picked from commit 84db57871785d84c2a32edc22f769821b3bec961) (cherry picked from commit `1beab7af46`) (cherry picked from commit `8779d505f2`) (cherry picked from commit 21a788f2eb549a494d52ab23a47533d9a7534ee6) (cherry picked from commit a7cc6d168772e13bcf0808da14ff1ddf9baa64b2) (cherry picked from commit 25f840379f19e0b90e69078e6c09a3c36fdf13ac) (cherry picked from commit 0db65f11224f030877e5279b85af4b9e3e975ca7) (cherry picked from commit 0e08cbc854cc1561101f1efe68de1d0860f7c905) (cherry picked from commit 57de51db8d965a6c5a90477f58d2600fa3e7feda) (cherry picked from commit 5ab3dcabb1461f4453f58718c6802baeffff06c9)	2024-01-15 14:48:03 +00:00
Gusted	f2cdb2fa66	[META] Use correct language for .tmpl - Upstream chosen `Handlebars` as language for the templates, presumenly because Github doesn't have an syntax highlighter for Go. - Forgejo does have syntax highlighting support for Go templates, so use that. (cherry picked from commit a79718522dc432e32cf322498ddf22ec570fa8fd) (cherry picked from commit 380d847e5cdb179292c7bd1a5e3e6839fb8b31dd) (cherry picked from commit 4126a9672d93fc33b72fb816a404056aac64dfc8) (cherry picked from commit afde0ed82271df540348953a811a8e9db1a83343) (cherry picked from commit 6ddaca00615340958e1aecca2c4807e39a2b1eff) (cherry picked from commit 454b2f6b35c018cc631dd8847ae9d3243d9adc37) (cherry picked from commit 58c10e1f93da8d8f193936eff00ebd86ecd8b78c) (cherry picked from commit 19ec0a5536204105be78744b436a35710d8e8702) (cherry picked from commit c3717ae4deb8acb43f861675dc44f689def544ed) (cherry picked from commit 6c74bbe5757b290c2fe5ea13cd980a2b11fb207e) (cherry picked from commit 9cb48db780c3592a6aa1df2770a309729eca35f6) (cherry picked from commit 19cb774553302a7ece9d653d052b6de4c47de687) (cherry picked from commit ac35eb83cd6f34da6079ec4ba8d00390aa56a0c0) (cherry picked from commit 986a306d221b14891d1e5776ad3088d5636595cb) (cherry picked from commit `cd841848ee`) (cherry picked from commit `9fd13853df`) (cherry picked from commit 4fa3942c19918a6333cc210bd247ce01ee51ccde) (cherry picked from commit da23365e0f4224cebd4dd3c1d062c8d9d4082369) (cherry picked from commit 72d189e4c411311155b3898e3b323e15986e2f70) (cherry picked from commit d9f2a915c2c41c4e27e96d5fbcaccfa368178673) (cherry picked from commit d8773a323d9f7bbc9b6f4b752efcaad112ee8423) (cherry picked from commit aedaafe947b2f3715ba06b6c3423543310300ed3) (cherry picked from commit f6ce73da178ea276daed94a9157c762f1f3e8642)	2024-01-15 14:48:03 +00:00
Earl Warren	d3769a6cdc	[TESTS] increase test-sqlite log level to Trace It does not pollute the output because they go to sqlite-log/gitea.log and it may provide clues for debugging. When trying to figure out a problem in production, Debug is likely to be used but in a development environment a very fine grain log is the most useful. If that's really too much noise, the lines can be trimmed by removing all those with [T]. (cherry picked from commit 666b02eb9d6e50b3a8d3ec5659fa6fb8451d0d9f) (cherry picked from commit b69e4d30581258d82d9b2a4daf932f75d7d7171e) (cherry picked from commit 0c1aecd7ec0d3bf9801c02ae24c89dd5ce074255) (cherry picked from commit 0304e41345e8ab19537d3686b5487c8cb4b280c2) (cherry picked from commit 4bcc7e02ce496bea54de39d1059cf39617d2a8d9) (cherry picked from commit 98364235f2792ce058984c03dde2f609adfbfc88) (cherry picked from commit ca465e97c1b5d1db684cf9fa1ecbaa14f4bb077c) (cherry picked from commit 653045ade1e2423ce363ffd2682c1f5cadf8059f) (cherry picked from commit 9ca2e644ab28c867a92925a6eb83ecbb6805434f) (cherry picked from commit 47c8a05b37d17201b24bab2d211d672e1fd6c2e0) (cherry picked from commit 4235d929ed1cb03e96c4f117a33b3120372235e0) (cherry picked from commit 10541c4b1c61ce6dc8c56481c0999e6ed52dbc80) (cherry picked from commit c1a0e1eb2f7673de83a57295531675c1ffbcdc8e) (cherry picked from commit 1c20bf30b2e9d1be68c6b2175fe33965a6bf761c) (cherry picked from commit d4b372db3108a350492d8dd8842cd6c98e7d3cdc) (cherry picked from commit fe3e43429979d8a9518861a5d795204038ee1f41) (cherry picked from commit `d2b544847f`) (cherry picked from commit `059f067a98`) (cherry picked from commit 72ad3d7d7e1fdc7132418e0051f76df617dffad7) (cherry picked from commit 6037e9a273162ae9d478bf844cc0b6145c334a77) (cherry picked from commit d63aee6921aa061d61169e00f4cdf7a693066724) (cherry picked from commit 7a0d05f802cf48fbb1cedbe2dd7095b4c35a8df2) (cherry picked from commit 9b9965b269a84b25b20aa1dc2b1e076e55136edd) (cherry picked from commit 5ca35d9753c382c700bf20327c721fb3854f694f) (cherry picked from commit 9b003f0a0ebd62752daacb72512bb6c92bc6e404)	2024-01-15 14:48:03 +00:00
Earl Warren	9c5d675ded	[TESTS] coverage for SignInOAuthCallback (cherry picked from commit f8e1619b993943eafb8ee12bf06f4cdb5862de70) (cherry picked from commit 46d8bc9bdf68b53767211dc103e6130f55bcdb64) (cherry picked from commit e0c7b7055f5f4eeca84f1d0b1260b7b9622d3aab) (cherry picked from commit faab747f8e7eb09262f755445462a77f8a6fb953) (cherry picked from commit 46acb6a9a79e7ce588b2863aa37bf26805afb2b1) (cherry picked from commit 22d964e74407c52ffcd3d3a84b0a66e2c186b0fa) (cherry picked from commit 4c8a6031acf760c2383d9e103c703ee5ececb8e8) (cherry picked from commit 032e8c7a9a357a13f41410063c2f7fb925dba5ac) (cherry picked from commit 7a17a3b0fb979e2923019de4b9a7318f578b73b8) (cherry picked from commit 8ea71c2a31ea7492f5f2e3de529c7fd0b232d3e3) (cherry picked from commit 4b027e2d37cb91c5951f1d10a018778b19590eb0) (cherry picked from commit d787089a5de09fa11f8e82a66ec43e4abdde1b2e) (cherry picked from commit 7b9999357a5d34861b5fd7390cc400f497896246) (cherry picked from commit 80eb531c380914c66d30a29159b81154e7adefeb) (cherry picked from commit 373b198bfbc29855c409294ee487639f83516a55) (cherry picked from commit 15781eedf755713ad4bbc83cf0b82e899e05d075) (cherry picked from commit 46bdb17a2fb25c23336ef493449ff3ff0eb05409) (cherry picked from commit 22ec6c11ee779cc06c2e6e6dca3213129033389e) (cherry picked from commit `3f94b9a111`) (cherry picked from commit `a4194c29ff`) (cherry picked from commit aa80ba2ed1e529a85eda01beeb25c6732d2bc9bf) (cherry picked from commit d349f3e80ec764f6f402ea6183e41511f73cd33f) (cherry picked from commit ccb073f71ac855b1d7c7dd1e71a29939a14a20c5) (cherry picked from commit d8a996a9c1052a7c4b7693cb75f10ee0cbce1534) (cherry picked from commit af12965737bf60bb74fed2ca5363b034eca15fe4) (cherry picked from commit 3867b17a485e441198b248be08cbe14bb8bd3946) (cherry picked from commit 0c48072b2e19f70530d76de459bddd9e7c539c0d)	2024-01-15 14:48:03 +00:00
Earl Warren	3cf9f82b28	[TESTS] oauth2: add integration test helpers (cherry picked from commit `e11dcc60f2`) use backticks to avoid backslash (cherry picked from commit `34212791ee`) (cherry picked from commit bde9473c69eaf6306457b4218d9704af64cb6cc8) (cherry picked from commit d4deb43084eec4ce0de786a01acef52921a39b13) (cherry picked from commit 08e91649b0057258ea5d775447d84093c31ad523) (cherry picked from commit 2b988e5415b35e608726facb5d23a920334fda1c) [TESTS] auth LinkAccount test coverage (squash) (cherry picked from commit a2b2e3066bee46ca15ce66d0deb7ef3e89915248) (cherry picked from commit 841d1b50731a94b9330b6a623a40f8aa0a6befa8) (cherry picked from commit 35da630ad884a9ffff5bd873123687af169a6cac) (cherry picked from commit caf2dc4fa7c6fb45a19edc5a025579d42d8db455) (cherry picked from commit 6eb81e67ba69aeb9f1290f6717ec6c6a367752c3) (cherry picked from commit d59757239f4fd6353dafd88f2460145b88ef38a1) (cherry picked from commit 38a121b6880538f381799fb69666e13abf667502) (cherry picked from commit 20613874ee04286a5ecb28045ec80af0fd850582) (cherry picked from commit 6d2705e10858baf5e33df0ced047c544ed826fd3) (cherry picked from commit f177b728142911fed6709339dd0e686017b610b0) (cherry picked from commit 75e1fc4c8318b378f94065a268b079ac152657ef) (cherry picked from commit ba64fa9867b06fb0b390a799ef4c3f39f554bb0b) (cherry picked from commit 0b8ab0893ec6b6d689534b5e4ac50cdfe36c34e9) (cherry picked from commit 1419d11435b0cdf7c41cb7175dffaf521ecfacd7) (cherry picked from commit 38766847e0441f4b3841b05b34e3442f4e23af06) (cherry picked from commit 6f23426a6ab09df7bb5817d364301975715dc10b) (cherry picked from commit 9e0ff9ca54505723ad39a3fb221b94cbcef2da66) (cherry picked from commit 353f3601c318f77a07fba0976fc9e3d28b2fc818) (cherry picked from commit `6e4ae401d8`) (cherry picked from commit `1a7afe4153`) (cherry picked from commit f9f3e0cc02fda87ef769ee8410e9d926963d2d97) (cherry picked from commit 22fd0337f3cc57e4365c783b80db553627022f6d) (cherry picked from commit ee57e138d1a89508f7613d1e6782a9909977b153) (cherry picked from commit 21f9b7e73ddf12948feb220ec5432e14b75e0baa) (cherry picked from commit 17c548c09298472af65526f1334fecffd1e72d1e) (cherry picked from commit 02d31865174d94273e993248aa152f482fa14802) (cherry picked from commit f02a040fa27afdbcf12d197894e9adc0a8a17734)	2024-01-15 14:48:03 +00:00
Earl Warren	dc2d448705	[TESTS] createUser via the user model helper for integration tests (cherry picked from commit `c1d14c5fff`) (cherry picked from commit e0e8aabc985af153cf1fcb2064c17f68ec37f3a2) (cherry picked from commit 392a415070af7f4e872c7bb013f259e2dcc8b7b4) (cherry picked from commit c7cf1307ca227ff9f4935391582c058823419d7b) (cherry picked from commit 93b13d092b46c261fc3c0f70ecd9d4f45ee84029) [TESTS] createUser via the user model helper for integration tests (squash) (cherry picked from commit 6ff23839528db66ae91e88d6b687b63c769f8f43) (cherry picked from commit de2a6fe8c374965d50bcd6421d44c3a5d312a689) (cherry picked from commit 398a6ab072e8364db3c5236bf258ec6bb068dc29) (cherry picked from commit 16abc89780a228fdc288ed2ce44a95daa6368e36) (cherry picked from commit 312a3ec5d9d50864af9dbfb8672778789b2e11ca) (cherry picked from commit 85c6d8e29065641ccbaf57fcebe72b93141a14a4) (cherry picked from commit 79150d30a4d9a91e9e5272f3d46bd0ee836bcab1) (cherry picked from commit 436137962d3f150d4c28093461c30c9910f2d32d) (cherry picked from commit e4eb8d471e8e1c8e14a6a3208418bde0b121472c) (cherry picked from commit a7257052f49a480dd2ccfbef5c0573c9b5b73adb) (cherry picked from commit d5eba9a6dd93eb21350dc611edff7c9a13cb2552) (cherry picked from commit d89ef2ffa9a83249b498867a02996a3dcb17aa31) (cherry picked from commit f1d25aa30762ae97d7994048dd03c656028dedbe) (cherry picked from commit 60c7c0735376d7987717c0d375fa409ca9b90e8f) (cherry picked from commit cfeff3afdb80785019f53312369953e2d996de89) (cherry picked from commit 608ac6bd683d60fe295163ba5562aee5037b6e01) (cherry picked from commit c64e530a13fe4afc89ad3de481fff16fe190c3d1) (cherry picked from commit 513db02971fa98ff88f9b06bf25b03c31d0a857c) (cherry picked from commit `43eaaa5a61`) (cherry picked from commit `678eb49440`) (cherry picked from commit f7458dabda74dedecb431a75e9f049e545fc973e) (cherry picked from commit 32568e43b412bf53bc207f5b429ee4ef77693857) (cherry picked from commit 3fcbb2043d04fb701a7baa26cc599c98dfaa5601) (cherry picked from commit 95f0b8eefad590c647951f42bd0f467685901bd2) (cherry picked from commit f285b9469d0b644abc70ebbc79c4b14fe5a03e56) (cherry picked from commit 4b8a02ad088bc925dee1b2f0b759ea9ef77d96e8) (cherry picked from commit 70eb98025b6012f42c0161999f7675f069bde877)	2024-01-15 14:48:03 +00:00
Loïc Dachary	81412571f8	[SECURITY] default to pbkdf2 with 320,000 iterations (cherry picked from commit 3ea0b287d74b8fc0dad08b2a539105e1aa1c1e67) (cherry picked from commit db8392a8ac093d4d3760e8bb40c56d8e194d44fb) (cherry picked from commit bd2a5fa2923c320e01faeaa1fdc1ad823c337027) (cherry picked from commit 2436acb3d986bad08aa134e450420fc4a08f5d62) (cherry picked from commit 62f50e1c521c30729781e5cd58882e743bb8b851) (cherry picked from commit dba18925217254d22f76306c0fe1c046c419268e) (cherry picked from commit 4b58e3b6d41f9e42fd34469184a3c7d4c5205c86) (cherry picked from commit 12470568569fec0644319d3d263a82bc7acdc0c3) (cherry picked from commit afbaea700972ddd4cb788d0b6d5e78de5558756a) (cherry picked from commit dcd4813d96f8d4e429914f4c8f951bd25b23afca) (cherry picked from commit b51dc963d1625bd7b9869302ec1ae70bbafb4442) (cherry picked from commit 611e895efd28026fdc4661893172356e76f6c3d0) (cherry picked from commit fd492a03f5335c138e143e784657f7012484bd8c) (cherry picked from commit 2c99991f44a15466339bb82b29d455c66795721b) (cherry picked from commit `7426c1edb4`) (cherry picked from commit 373244f8b2d449e8811e488e3a3732ba9bc79eaa) (cherry picked from commit 4f6efecdb9d932459dd9f4d7ee393a121a7bbb96) (cherry picked from commit 61d500808e443ce770b06fa1b87728a7785bd387) (cherry picked from commit 65f8384b6361c39d48df95227b047a20977482be) (cherry picked from commit 12ed28e734f79203ad6bf94774008715da6efd21) (cherry picked from commit ec6cdc9e1a9544f4f2b0ad7256ed2a8b15cf5335) (cherry picked from commit 08653ba05119906e066455a3e3913e66c179dbf3) (cherry picked from commit d5847c87cbcf0fd15953fb7aeadd1cece989b6c9) (cherry picked from commit 640a96e19be0c7faedf5aedfd90c15df8dc8f376) (cherry picked from commit 46177814a9ee8596b58055b57bea5441a893de7f) (cherry picked from commit b0098f5a80356757107cc4dd58bf24e2acba6b26) (cherry picked from commit ce5ddeeca9fa39180a2f9630c82007f8e9410867) (cherry picked from commit 5736fa1025681244b8eefef9a14b0715fa37d9a1) (cherry picked from commit c43ca210fcbc2589158df8c2c3036dedb00eaa52) (cherry picked from commit 7f92906bf3c72649dd2668263761ded71cf5ee91) (cherry picked from commit f726525d2dba5e481f758624e62eeaa3d38be564) (cherry picked from commit db86c93b0b7d2c1a7c17fcb6047b3d75873f9bbe) (cherry picked from commit 6751bd93c3faf4be0f29b52b4c41626a244a2a54) (cherry picked from commit 74bb523ac96062f93f20c174dcc9b1dc7ad94b13) (cherry picked from commit 94f9045a81ef58ecb6671d1e8f2ad31a7758ea9a) (cherry picked from commit 5297eac42d905d10060de688963f111cbefe49d4) (cherry picked from commit `57e3c57c51`) (cherry picked from commit `c5cacfee51`) (cherry picked from commit dfa31ee0048dcf5c3b8d6fec6184f665a019f014) (cherry picked from commit d7d10a76b41079cab423f00a96426a8de19fb876) (cherry picked from commit 62bd4edd4622ea778d8994d05c535de677819544) (cherry picked from commit 798c211f86f4ce713ab3fc18411fd72a57a219ef) (cherry picked from commit 1f645aeceafdf6f4f74864b14d939c4bcdf096be) (cherry picked from commit 8a8b62e10e9678fe33e32fa75f4b8c78e6aef68f) (cherry picked from commit d3ff4e1fdfdaa272941d86735c91107f03280294)	2024-01-15 14:48:03 +00:00
Earl Warren	d15627aa0d	[API] Forgejo API /api/forgejo/v1 (cherry picked from commit 20b56692693e054bb3c04b4ef12b29b0715b4530) (cherry picked from commit 1574643a6a9634e5b92c033a4bfb69062a86bd05) Update semantic version according to specification (cherry picked from commit 22510f41306f9c133a7e99b61f9c38dabfd4b810) Mise à jour de 'Makefile' (cherry picked from commit c3d85d8409f1bb18a45659a167cf1ffee057f3b6) (cherry picked from commit 5ea23098513c068444226af41faf9be9c4c998e6) (cherry picked from commit ec5217b9d1b94bb04e34ce8c27eecbdc6f3a247a) (cherry picked from commit 14f08e364b2ad7e3176b45d3ec8da5f5605b4315) (cherry picked from commit b4465c67b8737aed9fd79a43046aa3795a298e68) [API] [SEMVER] replace number with version (cherry picked from commit fba48e64977a75e77c9c6cf8e3f8a679a5e7b733) (cherry picked from commit 532ec5d8782703b62d7d02312764e50637cd016e) [API] [SEMVER] [v1.20] less is replaced by css (cherry picked from commit 01ca3a4f4291cf4c62df42cbd12a00638f3cdc70) (cherry picked from commit 1d928c3ab2e1fda6082e1400d89ea96d6605ebaa) (cherry picked from commit a39dc804cd1da86444ed709455857f069475e7db) Conflicts: webpack.config.js (cherry picked from commit adc68578b3eb41215338125edfca91804706f8a1) (cherry picked from commit 9b8d98475fd7efcc15bf0d91b0af6ef3aff64508) (cherry picked from commit 25161039745a63282257eded9616390241af8013) (cherry picked from commit 18e6287963a0e1863cd08fd514a4e732a1904a68) (cherry picked from commit e9694e67ab93ad74f7eae3152d88d95e8493e739) (cherry picked from commit a9763edaf002c8009a2cca4115cb8b926f8cdc85) (cherry picked from commit e2b550f4fba144f9637a212b56bfe30cac1adb3b) (cherry picked from commit `2edac36701`) [API] Forgejo API /api/forgejo/v1 (squash) Update semver as v1.20 is entering release candidate mode (cherry picked from commit 4995098ec3c6eee19a7ad7bc956b71c6e937c04c) (cherry picked from commit 578ccfdd27d7a280050bdf61d497d07decf98f2f) (cherry picked from commit 1bf6ac09520490f0a56b9b55d7836c2d8ea5d22c) (cherry picked from commit 2fe16b2bfed62c0386d0bfe104f7dcc621d1c3be) (cherry picked from commit 7cd9d027eec5a2b328d06a47f34545943560fe1b) (cherry picked from commit eaed4be2ae88055a15dcc96564440c301a13ba8e) (cherry picked from commit cc94f3115f844a0f16064e49e5eb719d33bc4441) (cherry picked from commit d7a77e35ccfd2d0fc2ba98932296ab7354edd2db) (cherry picked from commit cd8eb68ab7b3e2eaacf78d370c762f43cc19fd6a) (cherry picked from commit 68487ac95f742837e7ff38df902834b6173cd9ab) (cherry picked from commit 616dceb565456d6fac6f58b1c4de43e9d3254090) (cherry picked from commit 545fe5975b47d2eab348a57b87c6fd4590f33442) (cherry picked from commit c042cf8eda2dea805138bd64daa7fbe07865ed5a) (cherry picked from commit ae5e5a7468aa66312055a26841f658574a9b0dd7) (cherry picked from commit 8034ef5fa2648a127f8c84c572bec02a1ff6bb9f) (cherry picked from commit aaf0293034468505449d33ab1483ae65b4175754) (cherry picked from commit daafa8ce58e5e6077da585b13e5190856228a4a3) (cherry picked from commit 7ca3681d3e2ed5ec1ae44364cba476d642e2b557) (cherry picked from commit 39f72cba71ff3f9d2cbb05c88031b34933573a8c) (cherry picked from commit 60a591713097384935ba0ac51a5cd4793f7544a8) (cherry picked from commit 4853bd9e16bc8986ba8159349e93bc3093dc8ab9) [API] Move forgejo api file (squash) - Move the file to accommodate `faa28b5a44` (cherry picked from commit bce89351d251bfa18c677b30bc7da80856d919fb) (cherry picked from commit 11ae7f6e85395b287c6f4108c531aa1a81fd964c) (cherry picked from commit 25e96cfcb28859406329090eb0c7990bea4e73eb) (cherry picked from commit `6d8d19b391`) (cherry picked from commit `5afc5c454b`) (cherry picked from commit 86d07b4c249211bdb77c0520f99f2c8e5d89b516) (cherry picked from commit e54d869fdae44811faaa80f3757efbc93bf0bce4) (cherry picked from commit ab31ef1bba3bc5188e0f3ce5e5fa33335877cf47) (cherry picked from commit 511cbca2f3799646edf8eae00464b87f43ca280f) (cherry picked from commit 333916fea874509063f9449f07d79e4cafbcf06f) (cherry picked from commit 3802bcd7c9865b77151ef454c0bdc2ce32157a41) (cherry picked from commit 5d0fa034f77388ed21735a22cf1a2a23562245c3)	2024-01-15 14:48:03 +00:00

1 2 3 4 5 ...

17206 commits