Commit graph

39755 commits

Author SHA1 Message Date
Claire
abfdafef1e Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/auth/setup_controller.rb`:
  Upstream removed a method close to a glitch-soc theming-related method.
  Removed the method like upstream did.
2023-04-22 10:06:11 +02:00
Kouhai
bee2a9acf4 th: speedy clone for fast(er) ci 2023-04-22 00:38:08 -07:00
Kouhai
bd2edc2d37 th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
Kouhai
1a5be8312f th: fix presenter before merge 2023-04-22 00:38:08 -07:00
Kouhai
4be96df50b th: fix build 2023-04-22 00:38:08 -07:00
Kouhai
ac9104875b th: fix extension 2023-04-22 00:38:08 -07:00
Kouhai
33bff421e4 th: hack: fix excessively noisy babel traces 2023-04-22 00:38:08 -07:00
Kouhai
769e168633 th: ugh 2023-04-22 00:38:08 -07:00
Kouhai
94df215108 th: compose out of the box, more-or-less 2023-04-22 00:38:08 -07:00
Kouhai
7eeaa71d6f th: fun, image tagging, and SOURCE_TAG 2023-04-22 00:38:08 -07:00
Kouhai
39e4e8b0d7 th: optimize dockerfile (attempt was made) 2023-04-22 00:38:08 -07:00
Kouhai
07492326d1 th: berry flavored yarn 2023-04-22 00:38:08 -07:00
Kouhai
86480e9b49 th: update js deps 2023-04-22 00:38:08 -07:00
Kouhai
ee1dc4a0d1 th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
Kouhai
7ce5d26bf4 th: Add foreman to development deps 2023-04-22 00:38:08 -07:00
Kouhai
3bb32113c8 th: use {RAILS,NODE}_ENV=development when running webpack-dev-server with Foreman 2023-04-22 00:38:08 -07:00
Kouhai
da1aa87c6f th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
Kouhai
228f9c72d4 th: update models, node/Gemfile state 2023-04-22 00:38:08 -07:00
Kouhai
705fd6c182 th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
Kouhai
a936e75d02 th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
Kouhai
4de0440c46 th: consistent dividers 2023-04-22 00:38:08 -07:00
Kouhai
4f30ab5515 th: add deps rake tasks 2023-04-22 00:38:08 -07:00
Claire
f769daf908 Change automatic post deletion thresholds and load detection (#24614) 2023-04-21 18:14:19 +02:00
Claire
501d6197c4
Change automatic post deletion thresholds and load detection (#24614) 2023-04-21 18:14:19 +02:00
Claire
a55f461b4b Fix infinite loop in emoji replacement code (#24615) 2023-04-21 18:08:28 +02:00
Claire
fbb4de3dbc
Fix infinite loop in emoji replacement code (#24615) 2023-04-21 18:08:28 +02:00
Claire
d1e9e79cb7 Minor clean up and optimization of the automatic post deletion code (#24613) 2023-04-21 16:53:50 +02:00
Claire
b0eba1a060
Minor clean up and optimization of the automatic post deletion code (#24613) 2023-04-21 16:53:50 +02:00
dependabot[bot]
525024e4c9 Bump rubocop from 1.49.0 to 1.50.2 (#24580)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-21 00:06:56 +09:00
dependabot[bot]
88ce59505e
Bump rubocop from 1.49.0 to 1.50.2 (#24580)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-21 00:06:56 +09:00
Claire
2473078db7 Fix characters being emojified even when using Variation Selector 15 (text) (#20949) 2023-04-20 16:43:55 +02:00
Claire
37886c28da
Fix characters being emojified even when using Variation Selector 15 (text) (#20949) 2023-04-20 16:43:55 +02:00
Daniel M Brasil
e9039513a0 Fix uncaught ActiveRecord::StatementInvalid exception in Mastodon::AccountsCLI#approve (#24590) 2023-04-20 10:57:11 +02:00
Daniel M Brasil
faf657d709
Fix uncaught ActiveRecord::StatementInvalid exception in Mastodon::AccountsCLI#approve (#24590) 2023-04-20 10:57:11 +02:00
Tim Campbell
305196d948 Added manual running to nightly image build (#24598) 2023-04-19 21:46:31 +02:00
Tim Campbell
c62604b5f6
Added manual running to nightly image build (#24598) 2023-04-19 21:46:31 +02:00
Tim Campbell
251d107ec2 Added job to build nightly container (#24595) 2023-04-19 19:20:25 +02:00
Tim Campbell
e798b8615c
Added job to build nightly container (#24595) 2023-04-19 19:20:25 +02:00
fusagiko / takayamaki
f14395c2cf Allow == when null checking (#24593) 2023-04-19 17:46:46 +02:00
fusagiko / takayamaki
c1a7e38d2b
Allow == when null checking (#24593) 2023-04-19 17:46:46 +02:00
Eugen Rochko
3ca64638d4 Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
Eugen Rochko
e98c86050a
Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
Robert R George
335b53ab48 Add trend management to admin API (#24257) 2023-04-18 11:33:30 +02:00
Robert R George
4db8230194
Add trend management to admin API (#24257) 2023-04-18 11:33:30 +02:00
dependabot[bot]
6cf564a7c6 Bump faker from 3.1.1 to 3.2.0 (#24579)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-18 10:39:46 +02:00
dependabot[bot]
1153531e92
Bump faker from 3.1.1 to 3.2.0 (#24579)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-18 10:39:46 +02:00
dependabot[bot]
dd96b4ccec Bump reselect from 4.1.7 to 4.1.8 (#24565)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-18 10:12:05 +02:00
dependabot[bot]
426e3cc3bc
Bump reselect from 4.1.7 to 4.1.8 (#24565)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-18 10:12:05 +02:00
dependabot[bot]
1b59cbb96f Bump postcss from 8.4.21 to 8.4.22 (#24570)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-18 10:11:53 +02:00
dependabot[bot]
fe1ac6b0b0
Bump postcss from 8.4.21 to 8.4.22 (#24570)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-18 10:11:53 +02:00