Noa Himesaka
d45671066c
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-10-17 00:30:51 +09:00
Claire
c574f5b53f
Change how migrations duplicated between glitch and upstream are handled ( #2878 )
2024-10-09 18:36:19 +02:00
Noa Himesaka
0e5dd35e84
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-10-08 23:58:28 +09:00
Claire
7e06d724c9
Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream
2024-10-07 20:45:07 +02:00
Claire
a59160cf01
Add missing on_delete: :cascade on notification_permissions ( #32281 )
2024-10-07 07:46:03 +00:00
Claire
b28ce2424c
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream renamed a constant that was used slightly differently in glitch-soc.
Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
Matt Jankowski
4cae309f6a
Fix Rails/CreateTableWithTimestamps cop ( #30836 )
2024-10-01 13:56:43 +00:00
Noa Himesaka
262ddc00f4
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-09-28 23:23:16 +09:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Claire
62a39d60ce
Fix rolling updates by moving DropEndToEndMessageTables to post-deployment migrations ( #31963 )
2024-09-19 09:50:06 +00:00
Matt Jankowski
6f836c45aa
Remove crypto values from doorkeeper application/token scopes ( #31945 )
2024-09-18 09:27:50 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
Claire
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
Eugen Rochko
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +00:00
Claire
fef055db96
Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
Upstream refactored this file, while we had a change to switch a default setting.
Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
Upstream refactored this file, while we stubbed different methods.
Updated as upstream did, and updated the stubs accordingly.
2024-09-03 21:51:53 +02:00
Matt Jankowski
4682804448
Fix Rails/ReversibleMigration cop for remove_index ( #30832 )
2024-09-03 15:32:22 +00:00
Claire
402c1e116d
Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream
2024-09-02 17:43:10 +02:00
David Roetzel
388d5473e1
Refactor (ruby) redis configuration ( #31694 )
2024-09-02 14:19:55 +00:00
Claire
11b8017b45
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream
2024-08-26 18:52:33 +02:00
Matt Jankowski
bcc4b1078c
Fix Rails/RootPathnameMethods cop ( #31582 )
2024-08-26 07:35:07 +00:00
Noa Himesaka
acf40f349d
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-08-24 22:53:34 +09:00
Claire
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
Claire
cbdd8edf68
Revamp notification policy options ( #31343 )
2024-08-09 13:30:55 +00:00
Claire
fb411b6d0f
Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream
2024-07-27 13:19:38 +02:00
Noa Himesaka
7b8d855ec2
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-07-27 15:28:10 +09:00
Emelia Smith
693d9b03ed
Enable OAuth PKCE Extension ( #31129 )
2024-07-26 08:53:10 +00:00
Claire
cf5d2c3fe4
Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream
2024-07-25 17:47:02 +02:00
Matt Jankowski
34626b8291
Update schema to reflect full db:migrate run results ( #31128 )
2024-07-25 10:37:48 +00:00
Claire
c546757cd1
Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream
2024-07-16 17:54:36 +02:00
Emelia Smith
aa88aca0ad
Add optional OAuth application to reports ( #30539 )
2024-07-16 13:23:08 +00:00
Claire
edec2e9fdf
Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream
2024-07-14 18:43:35 +02:00
David Roetzel
35a437a03f
Destroy NotificationRequests that are dismissed ( #31008 )
2024-07-12 12:09:52 +00:00
Noa Himesaka
b82a823bd5
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-07-05 00:47:49 +09:00
Claire
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
Matt Jankowski
51f581e03e
Fix Rails/ReversibleMigration cop for remove ( #30833 )
2024-06-26 13:51:44 +00:00
Matt Jankowski
528a7f57fa
Fix Rails/ReversibleMigration cop for change_column ( #30835 )
2024-06-26 13:51:11 +00:00
Claire
3b4607991d
Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream
2024-06-22 20:59:23 +02:00
Matt Jankowski
4651c0cb39
Fix Rails/ReversibleMigrationMethodDefinition cop ( #30794 )
2024-06-21 14:43:12 +00:00
Noa Himesaka
28a07d2e78
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-06-14 18:31:42 +09:00
Claire
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
Claire
9e9613b286
Fix mentions.account_id and mentions.status_id not having NOT NULL database constraints ( #30591 )
2024-06-07 13:45:11 +00:00
Claire
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
Emelia Smith
e02d23b549
Change read:me scope to profile scope ( #30357 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-06 07:30:10 +00:00
Claire
974335e414
Add experimental server-side notification grouping ( #29889 )
2024-06-03 08:35:59 +00:00
Claire
c827a98f19
Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
Eugen Rochko
128987eded
Add support for fediverse:creator OpenGraph tag ( #30398 )
2024-05-29 01:34:33 +02:00
Claire
20fdf8e22c
Merge commit '0a2110b9af52005798251dc9d245a66dd5dd20fa' into glitch-soc/merge-upstream
2024-05-20 17:47:48 +02:00
Claire
00cf8d3748
Change older Paperclip database migrations for consistency ( #30204 )
2024-05-20 14:59:27 +00:00
Claire
2bcbeed951
Add some error handling to OTP secret migration ( #30344 )
2024-05-20 14:59:23 +00:00
Noa Himesaka
5496985873
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-05-16 18:43:16 +09:00
