166d412414
Merge remote-tracking branch 'treehouse/main' into th-downstream
2024-02-17 00:59:36 +09:00
Kouhai
3644101a79
th: Merge remote-tracking branch 'glitch/main'
2024-02-16 03:59:40 -08:00
Kouhai
d6a8c69b5c
th: Merge remote-tracking branch 'glitch/main'
2024-02-16 03:58:50 -08:00
Kouhai
26e086cd0b
th: DIVERGENCES.md
2024-02-16 03:50:20 -08:00
Kouhai
ecc917008e
th: maybe deal with spam
2024-02-16 03:49:59 -08:00
Claire
d7d477047e
Bump version to v4.3.0-alpha.3 ( #29241 )
2024-02-16 12:17:15 +01:00
Claire
6c1b6194f7
Merge pull request from GHSA-jhrq-qvrm-qr36
...
* Fix insufficient Content-Type checking of fetched ActivityStreams objects
* Allow JSON-LD documents with multiple profiles
2024-02-16 12:17:15 +01:00
renovate[bot]
63080e10a9
Update dependency pg to v1.5.5 ( #29230 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-16 10:06:25 +01:00
76b36ba10d
Revert "Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream""
...
This reverts commit 8aae9712d9
2024-02-15 12:30:05 +09:00
52aeef3834
Merge remote-tracking branch 'treehouse/main' into th-downstream
2024-02-15 12:19:13 +09:00
8aae9712d9
Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream"
...
This reverts commit fa3b5195fd1b1c4ff940
2024-02-15 12:16:40 +09:00
Claire
e7ca82762d
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 23:12:59 +01:00
Kouhai
bb4c06aa95
th: reapply css
2024-02-14 12:25:28 -08:00
Kouhai
a1c7ba38b7
th: Merge remote-tracking branch 'glitch/main' ( 486e4bc7d3)
2024-02-14 09:59:05 -08:00
Kouhai
c2887ef289
th: remove caddy from procfile
2024-02-14 09:57:16 -08:00
Claire
486e4bc7d3
Fix OmniAuth tests ( #29201 )
2024-02-14 16:07:28 +01:00
Claire
40439399c6
Bump version to v4.3.0-alpha.2 ( #29200 )
2024-02-14 15:26:18 +01:00
Claire
53b73ed6a2
Merge pull request from GHSA-vm39-j3vx-pch3
...
* Prevent different identities from a same SSO provider from accessing a same account
* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`
* Rename methods to avoid confusion between OAuth and OmniAuth
2024-02-14 15:25:15 +01:00
Emelia Smith
436419cc2f
Merge pull request from GHSA-7w3c-p9j8-mq3x
...
* Ensure destruction of OAuth Applications notifies streaming
Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.
* Ensure password resets revoke access to Streaming API
* Improve performance of deleting OAuth tokens
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-14 15:25:15 +01:00
Claire
3c3ef8b9d3
Add sidekiq_unique_jobs:delete_all_locks task and disable sidekiq-unique-jobs UI by default ( #29199 )
2024-02-14 13:42:15 +01:00
Emelia Smith
eae436c5a8
Disable administrative doorkeeper routes ( #29187 )
2024-02-13 20:03:00 +01:00
Emelia Smith
b83076647e
Ignore legacy moderator and admin columns on User model ( #29188 )
2024-02-13 20:03:00 +01:00
renovate[bot]
7100106f3f
Update dependency sidekiq-unique-jobs to v7.1.33 ( #29175 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-13 20:03:00 +01:00
renovate[bot]
04da8f887b
Update dependency pghero to v3.4.1 ( #29144 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-13 20:03:00 +01:00
renovate[bot]
d9d0a6ef33
Update dependency irb to v1.11.2 ( #29135 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-13 20:03:00 +01:00
renovate[bot]
93b365bfc0
Update dependency webmock to v3.20.0 ( #29120 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-13 20:03:00 +01:00
Claire
e3c4e90646
Fix new list button being blank ( #2616 )
2024-02-13 12:48:01 +01:00
Kouhai
0d1e55d566
th: smile sweet sadistic surprise service
...
should've just hardcoded instead but noooooooooooo
"needs to be decent"
2024-02-13 16:59:34 +09:00
Kouhai
6a5351ede0
th: etc etc host host s s
2024-02-13 16:59:21 +09:00
Claire
084d051e6c
Merge pull request #2608 from ClearlyClaire/glitch-soc/refactor/monolithic-components-css
...
Merge SCSS in a single `components.scss` file
2024-02-12 22:18:55 +01:00
Kouhai
34f677cd03
th: smile sweet sadistic surprise service
...
should've just hardcoded instead but noooooooooooo
"needs to be decent"
2024-02-12 08:26:49 -08:00
Kouhai
7719de5665
th: etc etc host host s s
2024-02-12 02:37:48 -08:00
Claire
c249c10f74
Fix account suggestion size inconsistency with upstream
2024-02-11 21:55:36 +01:00
Ariadne Conill
c379487041
th: revert more emoji-mart twemoji 14 hacks
2024-02-10 21:02:47 -08:00
Ariadne Conill
342709ecb2
Revert "th: update emoji-mart sprite sheet for emoji 13.1"
...
This reverts commit ed992cd7d5
2024-02-10 20:57:20 -08:00
Ariadne Conill
eea2364a76
th: fix streaming image tagging
2024-02-10 20:22:44 -08:00
Ariadne Conill
191445ed32
th: drop obsolete emoji 14 patch vestiges
2024-02-10 20:02:11 -08:00
Claire
d391e01b59
Revert notification bar color for now
2024-02-08 21:12:57 +01:00
Claire
3f89cec3c9
Further reduce differences with upstream
2024-02-08 19:52:03 +01:00
Claire
f6f62002c7
Remove leftovers from glitch-soc's layout option
2024-02-08 19:21:35 +01:00
Claire
189b70cd6a
Merge SCSS in a single components.scss file
2024-02-08 18:50:38 +01:00
Claire
8c76a208ed
Merge pull request #2607 from ClearlyClaire/glitch-soc/cherry-pick-upstream
...
Cherry-pick upstream changes
2024-02-06 21:56:01 +01:00
Eugen Rochko
65eb943b9d
Fix confirmation e-mails when signing up through an app ( #29064 )
2024-02-06 21:00:33 +01:00
Claire
19f1ffe287
Fix self-destruct schedule not actually replacing initial schedule ( #29049 )
2024-02-06 21:00:09 +01:00
renovate[bot]
5ea36a3606
Update dependency brakeman to v6.1.2 ( #29062 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-06 20:59:51 +01:00
renovate[bot]
b27cad27c2
Update dependency bootsnap to '~> 1.18.0' ( #29019 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-06 20:59:51 +01:00
renovate[bot]
63f1f1465a
Update dependency tzinfo-data to v1.2024.1 ( #29052 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-06 20:59:51 +01:00
Matt Jankowski
4cd00c0dd9
Update nsa gem to version 0.3.0 ( #29065 )
2024-02-06 20:59:51 +01:00
renovate[bot]
c6f7e3a1fb
Update dependency haml_lint to v0.56.0 ( #29082 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-06 20:59:51 +01:00
renovate[bot]
93aa783aa1
Update dependency nokogiri to v1.16.2 [SECURITY] ( #29106 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-06 20:59:51 +01:00
