Commit graph

840 commits

Author SHA1 Message Date
Essem
14eede02f3
Merge remote-tracking branch 'upstream/main' 2024-07-27 18:24:05 -05:00
Claire
fb411b6d0f Merge commit 'dd53792714' into glitch-soc/merge-upstream 2024-07-27 13:19:38 +02:00
Emelia Smith
693d9b03ed
Enable OAuth PKCE Extension (#31129) 2024-07-26 08:53:10 +00:00
Essem
686007b390
Merge remote-tracking branch 'upstream/main' 2024-07-25 16:14:48 -05:00
Claire
cf5d2c3fe4 Merge commit '887e64efd4' 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
Essem
dd4980342f
Merge remote-tracking branch 'upstream/main' 2024-07-17 14:46:24 -05:00
Claire
c546757cd1 Merge commit '66430cb25c' 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
Essem
d0d49b2540
Merge remote-tracking branch 'upstream/main' 2024-07-14 16:32:10 -05:00
Claire
edec2e9fdf Merge commit '00cb4a0313' 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
Essem
8a01720cb2
Merge remote-tracking branch 'upstream/main' 2024-06-30 15:41:10 -05:00
Claire
d2aea85e6c Merge commit '5d4dbbcc67' 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
Essem
771014fc90
Merge remote-tracking branch 'upstream/main' 2024-06-24 14:01:26 -05:00
Claire
3b4607991d Merge commit '4743657ba2' 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
Essem
9dcd9ba5b2
Merge remote-tracking branch 'upstream/main' 2024-06-10 16:59:22 -05:00
Claire
7277d2f130 Merge commit '496c10542b' 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 '5652ca6135' 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
Essem
fad5adbfe6
Merge remote-tracking branch 'upstream/main' 2024-05-30 09:32:49 -05:00
Claire
c827a98f19 Merge commit 'd20a5c3ec9' 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
Essem
9b0c46ebf2
Merge remote-tracking branch 'upstream/main' 2024-05-20 21:35:02 -05:00
Claire
20fdf8e22c Merge commit '0a2110b9af' 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
Essem
4f37b4873f
Merge remote-tracking branch 'upstream/main' 2024-05-14 21:20:27 -05:00
Claire
f35ba6963d Merge commit '1959365c2f' into glitch-soc/merge-upstream 2024-05-11 22:10:56 +02:00
Claire
1959365c2f
Add missing on_delete: :cascade on notification_policies (#30251) 2024-05-10 20:00:25 +00:00
Claire
96fb6e491f
Revert "Migrate paperclip _file_size columns to bigint (#29263)" (#30203) 2024-05-07 08:46:05 +00:00
Essem
b636ca2099
Merge remote-tracking branch 'upstream/main' 2024-05-06 22:12:42 -05:00
Matt Jankowski
b152f936c1
Migrate paperclip _file_size columns to bigint (#29263)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-06 15:05:12 +00:00
Claire
3789d9f825 Merge commit 'b7902225d6' into glitch-soc/merge-upstream
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
  while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
  Switched to using upstream's implementation of the tests.
2024-05-04 16:28:30 +02:00
Claire
bac4026d80 Merge commit '85fdbd0ad5' into glitch-soc/merge-upstream 2024-05-04 15:10:54 +02:00
Essem
a7b905d573
Merge remote-tracking branch 'upstream/main' 2024-05-02 23:31:54 -05:00
Matt Jankowski
1e7d5d2957
Update devise-two-factor to version 5.0.0 (#28325)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-02 09:31:41 +00:00
Claire
eeefb7cdbc Merge commit 'a15139bc02' into glitch-soc/merge-upstream 2024-05-01 19:42:34 +02:00
Claire
360590ecd8 Merge commit 'a390299744' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
2024-05-01 19:30:41 +02:00
Claire
7b46517c38 Merge commit 'd49343ed11' into glitch-soc/merge-upstream 2024-05-01 14:31:14 +02:00
Matt Jankowski
d9eee9bf9a
Remove column defaults for status_pins timestamp columns (#29261) 2024-04-24 14:56:54 +00:00
Matt Jankowski
2ec9bff36e
Fix Rubocop Rails/UniqueValidationWithoutIndex cop (#27461)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-22 08:04:05 +00:00
Claire
5915bd7f45
Fix development environment admin account not being auto-approved (#29958) 2024-04-16 17:30:32 +00:00
Essem
ce98ee9b00
Merge remote-tracking branch 'upstream/main' 2024-04-10 17:36:38 -05:00
Claire
777984faeb Merge commit '119c7aa0df' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00