Jeremy Kescher
b1a8a42664
Merge branch 'refs/heads/glitch' into develop
2024-07-19 18:13:52 +02:00
Claire
c75fe09e2b
Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream
2024-07-18 17:56:25 +02:00
Matt Jankowski
848b59c8ae
Reduce factory creation in MediaAttachment model spec ( #31058 )
2024-07-18 15:23:46 +00:00
Jeremy Kescher
1862a60e51
Merge branch 'refs/heads/glitch' into develop
2024-07-16 22:32:15 +02:00
Claire
64b2c712d4
Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict because upstream refactored theme-related code, and glitch-soc has
a different theming system.
2024-07-15 18:51:38 +02:00
Matt Jankowski
91ef4a6fc5
Add assertion about key columns to account key generate spec ( #30635 )
2024-07-15 10:42:18 +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
Claire
6a55232988
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream
2024-07-08 19:41:14 +02:00
Matt Jankowski
f1300ad284
Rename jobs/attachments rspec tag names ( #29762 )
2024-07-08 16:01:08 +00:00
Claire
d41b43ed4f
Limit attachments to MEDIA_ATTACHMENTS_LIMIT when returning posts through the API ( #30932 )
2024-07-08 07:41:50 +00:00
Jeremy Kescher
c1f70540c6
Merge branch 'refs/heads/glitch' into develop
2024-07-02 19:30:16 +02:00
Claire
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
Matt Jankowski
836c0477ac
Use vips setting instead of env var in media processing spec ( #30859 )
2024-06-27 16:03:26 +00:00
Jeremy Kescher
895b479c23
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-17 22:52:08 +02:00
Jeremy Kescher
209f90f670
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-16 05:32:45 +02:00
Claire
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
Matt Jankowski
d818ddd687
Extract SIGN_COUNT_LIMIT constant in WebauthnCredential class ( #30636 )
2024-06-11 15:36:21 +00:00
Matt Jankowski
62d070c438
Check both before/after state in AccountDomainBlock spec ( #30640 )
2024-06-11 13:59:56 +00:00
Matt Jankowski
1622f7aeb9
Remove duplicate fabricator validity checks ( #29667 )
2024-06-11 07:48:42 +00:00
Matt Jankowski
cfd4823b65
Use fabricator in follow_spec ( #30642 )
2024-06-11 06:57:09 +00:00
Claire
be68f8f4af
Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream
2024-06-10 18:20:08 +02:00
Matt Jankowski
9bf2e2eda0
Extract TEXT_LENGTH_LIMIT constant in Appeal class ( #30638 )
2024-06-10 15:23:17 +00:00
Matt Jankowski
3e3f3d7580
Match report validation spec to extracted constant ( #30633 )
2024-06-10 15:04:01 +00:00
Matt Jankowski
92b3004bf3
Reference constants from account validation specs ( #30634 )
2024-06-10 15:03:41 +00:00
Daniel M Brasil
28f9a8f2ec
Add Specs for Scheduled Status Model Validations ( #30585 )
2024-06-10 14:52:33 +00:00
Claire
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
Claire
1408733386
Fix Mastodon relying on ImageMagick even with MASTODON_USE_LIBVIPS ( #30590 )
2024-06-07 09:27:59 +00:00
Matt Jankowski
a662c6d1d8
Use sidekiq_inline in admin/account_action model spec ( #30565 )
2024-06-06 14:12:58 +00:00
Claire
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
Eugen Rochko
5f15a892fa
Add support for libvips in addition to ImageMagick ( #30090 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-05 19:15:39 +00:00
Claire
974335e414
Add experimental server-side notification grouping ( #29889 )
2024-06-03 08:35:59 +00:00
Jeremy Kescher
e73c612cb1
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-11 23:31:31 +02:00
Claire
016d194274
Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, upstream added helpers right next to glitch-soc only
helpers.
Added upstream's helpers.
- `spec/models/status_spec.rb`:
Not a real conflict, upstream added specs right next to glitch-soc only
specs.
Added upstream's tests.
2024-05-06 17:53:51 +02:00
Claire
30ef9fccf0
Fix hashtag matching pattern matching some link anchors ( #30190 )
2024-05-06 12:47:19 +00:00
Claire
e5062b7135
Fix post deletion not being deferred when those are part of an account warning ( #30163 )
2024-05-06 09:52:34 +00:00
Claire
3789d9f825
Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' 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
d6f9c97ae4
Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream
2024-05-04 15:24:22 +02: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
6204d13a2e
Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
There was an extra newline in glitch-soc for some reason.
Removed it.
2024-05-01 19:38:34 +02:00
Claire
360590ecd8
Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' 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
9ce82a35cb
Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream
2024-05-01 18:42:26 +02:00
Claire
0fb469e2f3
Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream
2024-05-01 17:30:52 +02:00
Claire
e845594878
Fix moderator account being exposed in account moderation notification ( #30082 )
2024-04-26 12:42:06 +00:00
Claire
4ef0b48b95
Add in-app notifications for moderation actions/warnings ( #30065 )
2024-04-25 17:26:05 +00:00
Matt Jankowski
11e0049b08
Use enum-generated scopes/queries for BulkImport ( #29975 )
2024-04-18 10:13:35 +00:00
Matt Jankowski
650c548c31
Add not_featured_by scope to Tag ( #28815 )
2024-04-17 10:05:38 +00:00
Matt Jankowski
6fed108703
Use Rails upsert to generate update_count! query in Counters concern ( #28738 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-17 08:16:51 +00:00
Jeremy Kescher
2df3b9f803
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/serializers/initial_state_serializer.rb
2024-04-11 21:50:48 +02:00
Matt Jankowski
285f63c02e
Use composable query in User.active scope ( #29775 )
2024-04-08 13:53:49 +00:00
