Commit Graph

416 Commits

Author SHA1 Message Date
carbotaniuman 754c1de51d Merge branch 'update-everything' into 'master'
Update all the deps

See merge request mangadex-pub/mangadex_at_home!103
2023-08-07 22:09:31 +00:00
carbotaniuman 04f5addfaa Update all the deps 2023-08-07 22:09:31 +00:00
Tristan 4078d07053 Merge branch 'fix-ci' into 'master'
Raise minimum guaranteed memory for gradle build to 3GB

See merge request mangadex-pub/mangadex_at_home!105
2023-04-12 00:51:20 +00:00
Tristan a37f82e21e
Raise minimum guaranteed memory for gradle build to 3GB 2023-04-12 01:42:28 +01:00
carbotaniuman 36ffe204a1 Merge branch 'docker-changes' into 'master'
Docker compose changes

See merge request mangadex-pub/mangadex_at_home!102
2023-04-07 20:51:29 +00:00
Georgi Yankov 1984a994a4 Docker compose changes 2023-04-07 20:51:29 +00:00
carbotaniuman aca092a141 Merge branch 'fix-contention' into 'master'
Try and fix contention issues

See merge request mangadex-pub/mangadex_at_home!101
2023-04-06 21:27:06 +00:00
carbotaniuman ac246e5449 Try and fix contention issues 2023-04-06 21:27:06 +00:00
carbotaniuman c9a5548770 Merge branch 'fix-error-string' into 'master'
Get the body of the error

See merge request mangadex-pub/mangadex_at_home!98
2022-02-21 17:16:08 +00:00
carbotaniuman aa0931dddc Get the body of the error 2022-02-21 17:16:08 +00:00
carbotaniuman acda98ae55 Merge branch 'update-and-fix' into 'master'
Update deps and fix

See merge request mangadex-pub/mangadex_at_home!100
2022-02-18 03:20:02 +00:00
carbotaniuman 08f72be1b0 Update deps and fix 2022-02-17 21:02:37 -06:00
carbotaniuman 85dce402df Merge branch 'fix-tls-and-crashes' into 'master'
Fix tls and crashes

See merge request mangadex-pub/mangadex_at_home!99
2022-02-17 06:27:44 +00:00
carbotaniuman d198c27de3 Fix tls and crashes 2022-02-17 06:27:43 +00:00
carbotaniuman c7830161c1 Merge branch 'fix-nits' into 'master'
Really fix CI

See merge request mangadex-pub/mangadex_at_home!97
2022-02-07 03:59:51 +00:00
carbotaniuman f651409e87 Really fix CI 2022-02-07 03:59:51 +00:00
carbotaniuman 0cf608a66b Update .gitlab-ci.yml 2021-10-19 04:55:53 +00:00
carbotaniuman 0d490b3d5b Merge branch 'modernize-ci-again' into 'master'
Fix a few more nits with CI

See merge request mangadex-pub/mangadex_at_home!96
2021-10-19 01:24:53 +00:00
carbotaniuman 0a7e738253 Fix a few more nits with CI 2021-10-01 23:13:34 -05:00
carbotaniuman 15f13eb7c3 Merge branch 'ci-test' into 'master'
Update CI

See merge request mangadex-pub/mangadex_at_home!95
2021-10-02 03:54:10 +00:00
carbotaniuman ce94b21b03 Update CI 2021-10-02 03:54:09 +00:00
carbotaniuman baecff51be Merge branch 'ci-update' into 'master'
Ci update

See merge request mangadex-pub/mangadex_at_home!94
2021-10-01 06:10:07 +00:00
carbotaniuman 7dc9c21a8b Ci update 2021-10-01 06:10:07 +00:00
carbotaniuman 7498ed0a4d Merge branch 'disable-token-validation' into 'master'
Add support for skipping token validation

See merge request mangadex-pub/mangadex_at_home!92
2021-10-01 02:21:31 +00:00
carbotaniuman ad392b30d8 Merge branch 'minor-cleanup' into 'master'
Minor cleanup

See merge request mangadex-pub/mangadex_at_home!93
2021-10-01 02:19:59 +00:00
carbotaniuman 85668ff207 Minor cleanup 2021-10-01 02:19:58 +00:00
carbotaniuman f93481975c Merge branch 'master' into 'master'
Add support for proxy protocol IP forwarding

Closes #85

See merge request mangadex-pub/mangadex_at_home!88
2021-07-19 16:38:10 +00:00
melink14 f3d35b60eb Add support for proxy protocol IP forwarding 2021-07-19 16:38:09 +00:00
Edward Shen 7f8b406164
Add support for skipping token validation 2021-07-19 00:34:50 -04:00
carbotaniuman 10e394db1e Merge branch 'better-cache-path' into 'master'
Remove regex use in cache path generation

See merge request mangadex-pub/mangadex_at_home!91
2021-07-11 20:36:39 +00:00
Edward Shen d35d5b386e
Remove regex use in cache path generation 2021-07-11 16:16:26 -04:00
carbotaniuman dd8e434024 Merge branch 'update-gradle' into 'master'
Update to Gradle 7 and Kotlin 1.5.10

See merge request mangadex-pub/mangadex_at_home!90
2021-07-11 19:27:49 +00:00
carbotaniuman a12d251bf4 Update to Gradle 7 and Kotlin 1.5.10 2021-07-06 14:40:02 -05:00
carbotaniuman 52f23b0f53 Merge branch 'testing' into 'master'
Cut 2.0.1

See merge request mangadex-pub/mangadex_at_home!87
2021-05-28 19:06:56 +00:00
carbotaniuman 22e318dafd Cut 2.0.1 2021-05-28 19:06:55 +00:00
carbotaniuman 5b154a6b20 Merge branch 'metrics' into 'master'
Update metrics

See merge request mangadex-pub/mangadex_at_home!86
2021-05-21 15:23:49 +00:00
carbotaniuman b0dfc9ff12 Update metrics 2021-05-21 15:23:49 +00:00
carbotaniuman 49c19e7879 Merge branch 'm3ch_mania-master-patch-86347' into 'master'
Update .gitlab-ci.yml

See merge request mangadex-pub/mangadex_at_home!85
2021-05-21 15:23:12 +00:00
m3ch_mania fe0fd429c3 Update .gitlab-ci.yml
Includes new .yaml-style config sample in the ZIP archive
2021-03-25 23:34:30 +00:00
carbotaniuman f62eb0db00 Merge branch 'm3ch_mania-master-patch-45260' into 'master'
Fix typo in settings.sample.yaml

See merge request mangadex-pub/mangadex_at_home!84
2021-03-21 23:22:27 +00:00
m3ch_mania 5c6af7caa6 Fix typo in settings.sample.yaml 2021-03-21 21:49:33 +00:00
carbotaniuman 74083bd68e Merge branch 'TheRedCrystal-master-patch-65248' into 'master'
Fix typo for cache size

See merge request mangadex-pub/mangadex_at_home!83
2021-03-19 01:00:12 +00:00
Space ae49f0098a Fix typo for cache size 2021-03-13 20:35:04 +00:00
carbotaniuman 4fed127e80 Merge branch 'next' into 'master'
Next

See merge request mangadex-pub/mangadex_at_home!82
2021-03-11 20:09:14 +00:00
carbotaniuman f9cf5729b4 Next 2021-03-11 20:09:14 +00:00
carbotaniuman 8178f1b0d6 Merge branch 'fix-access-control' into 'master'
Fix Access-Control-Expose-Headers header & CHANGELOG.md invalid dates

See merge request mangadex-pub/mangadex_at_home!81
2021-03-11 16:29:05 +00:00
Amos Ng 900e94c8a7
Fixed CHANGELOG.md date typo 2021-03-12 00:02:15 +08:00
Amos Ng f44b6476a7
Fixed Access-Control-Expose-Headers typo 2021-03-12 00:00:57 +08:00
carbotaniuman 1be9ee8506 Use HTTP/2 2021-03-02 12:22:24 -06:00
carbotaniuman 2252a9f02d Clean extra import 2021-02-24 21:49:54 -06:00