16249946ae
Merge pull request from GHSA-q3rg-xx5v-4mxh
2024-05-30 14:14:04 +02:00
3ea4275ae3
Merge pull request from GHSA-5fq7-3p3j-9vrf
2024-05-30 14:03:13 +02:00
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
d20a5c3ec9
Fix: remove broken OAuth Application vacuuming & throttle OAuth Application registrations ( #30316 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-29 14:00:05 +00:00
36fe8f8566
Change `ids` param to `id` in `/api/v1/statuses` and `/api/v1/accounts` for consistency ( #30465 )
2024-05-29 09:19:17 +00:00
c61e356475
Add `Status::MEDIA_ATTACHMENTS_LIMIT` configuration constant ( #30433 )
2024-05-27 09:49:44 +00:00
564ebfefcf
Remove hard reference from status pin validator spec ( #30432 )
2024-05-27 09:20:28 +00:00
51631c785f
Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
Glitch-soc had changes to adjacent lines.
Ported upstream's changes.
2024-05-23 20:30:23 +02:00
0e8633f6c7
Merge commit '3a862439dfc989c6c5741e007c2f4e0335fffe33' into glitch-soc/merge-upstream
2024-05-23 20:11:12 +02:00
133d98fb25
Normalize language code of incoming posts ( #30403 )
2024-05-23 17:28:18 +00:00
3a862439df
Remove unused account record in api/v2/admin/accounts spec ( #30397 )
2024-05-23 08:26:58 +00:00
5ab111554e
Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream
2024-05-21 17:45:21 +02:00
32223863a5
Add coverage to `/admin/accounts/:id` ( #30386 )
2024-05-21 13:17:34 +00:00
d3136e6d58
Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream
2024-05-21 12:06:38 +02:00
89f89d738f
Revert "Allow unblocking email addresses from any matching account ( #29305 )" ( #30385 )
2024-05-21 08:56:08 +00:00
20fdf8e22c
Merge commit '0a2110b9af52005798251dc9d245a66dd5dd20fa' into glitch-soc/merge-upstream
2024-05-20 17:47:48 +02:00
0a2110b9af
Add coverage for custom filters ( #30347 )
2024-05-20 15:00:09 +00:00
e46321e63d
Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream
2024-05-20 12:17:36 +02:00
de4815afda
Add more tests for self-destruct mode ( #30374 )
2024-05-20 10:06:51 +00:00
def6b686ff
Fix `Rails/WhereRange` cop ( #30343 )
2024-05-20 09:37:36 +00:00
70608f824e
Add coverage for `AdminMailer#auto_close_registrations` ( #30349 )
2024-05-20 08:03:39 +00:00
2da2a1dae9
Support multiple redirect_uris when creating OAuth 2.0 Applications ( #29192 )
2024-05-17 13:46:12 +00:00
2810231180
Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Upstream renamed a helper method everywhere.
There was one glitch-soc line involving changes because of the local-only post
feature.
Ported upstream's change.
2024-05-16 19:30:10 +02:00
65e82211cd
Rename `cache_*` methods to `preload_*` in controller concern ( #30209 )
2024-05-16 08:03:46 +00:00
5fd56512de
Improve Report Notes and Account Moderation Notes ( #30288 )
2024-05-15 13:38:36 +00:00
85c625d319
Fix repetitive database queries from #30040 ( #30259 )
2024-05-15 09:38:16 +00:00
6beead3867
Move `simplecov` config into `rails_helper` ( #30302 )
2024-05-15 09:33:36 +00:00
40639510f8
Retain unconfirmed users longer (1 week) ( #30285 )
2024-05-15 08:27:34 +00:00
f35ba6963d
Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream
2024-05-11 22:10:56 +02:00
0d397db5dd
Consolidate system specs into single directory, use rspec tags for configuration ( #30206 )
2024-05-10 12:36:09 +00:00
fa43a6c835
Use more accurate `redirect_uri` in oauth spec ( #30212 )
2024-05-10 09:43:59 +00:00
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
2fe1b8d169
Add API to get multiple accounts and statuses ( #27871 )
...
Co-authored-by: noellabo <noel.yoshiba@gmail.com>
2024-05-06 15:19:15 +00:00
bc24c4792d
Allow admins to configure instance favicon and logo ( #30040 )
2024-05-06 15:06:52 +00:00
116f01ec7d
Implement RFC 8414 for OAuth 2.0 server metadata ( #29191 )
2024-05-06 13:17:56 +00:00
30ef9fccf0
Fix hashtag matching pattern matching some link anchors ( #30190 )
2024-05-06 12:47:19 +00:00
dbaa4ed891
Use `chewy` which relaxes ES version reqs ( #30157 )
2024-05-06 11:50:45 +00:00
e5062b7135
Fix post deletion not being deferred when those are part of an account warning ( #30163 )
2024-05-06 09:52:34 +00:00
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
f09f5b35f2
Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream refactored this file a bit, moving validation limits to constants.
We already had a similar change, although with different constant names.
Updated to match upstream's code.
The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`
2024-05-04 16:12:51 +02:00
d6f9c97ae4
Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream
2024-05-04 15:24:22 +02:00
253ead3aa7
Fix not being able to block a subdomain of an already-blocked domain through the API ( #30119 )
2024-05-02 20:56:21 +00:00
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
2447497a4c
Status length validation spec updates ( #30132 )
2024-05-02 08:31:06 +00:00
b039e62194
Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream
2024-05-01 19:49:59 +02:00
eeefb7cdbc
Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream
2024-05-01 19:42:34 +02:00
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
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
946bd2e7e1
Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream
2024-05-01 19:16:48 +02:00
6f342a6d4c
Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict caused by our different theme systems.
Ported upstream's changes.
- `app/models/account.rb`:
Upstream basically made a change we already made.
Moved constant declaration to match upstream.
2024-05-01 18:56:48 +02:00
9ce82a35cb
Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream
2024-05-01 18:42:26 +02:00
555e33a392
Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Conflict because of our different theming systems.
Updated accordingly, along with `app/helpers/theme_helper.rb`
and `app/helpers/theme_helper_spec.rb`.
2024-05-01 18:38:55 +02:00
0fb469e2f3
Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream
2024-05-01 17:30:52 +02:00
15f6d2d038
Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Conflict due to glitch-soc having a different default site name.
Updated the tests as upstream did, keeping glitch-soc's default name.
2024-05-01 17:22:02 +02:00
2c386d4cfe
Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream
2024-05-01 17:06:49 +02:00
d52263e0e3
Merge commit '143d9553fa0187b9950a802cdedaea5c8cd12f75' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependencies as well.
2024-05-01 17:04:33 +02:00
7b46517c38
Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream
2024-05-01 14:31:14 +02:00
7208edbd37
Replace `use_pack`, `layouts/theme` and `@theme` by new helpers
...
Packs are now loaded from views, just like upstream, and are
identified by their filenames. The definition of `theme.yml` has
changed as such:
- `pack_directory` is now required
- `pack` is now unused
- `signed_in_preload` has been introduced
2024-04-28 15:45:42 +02:00
91ca90e25b
Fix Idempotency-Key ignored when scheduling a post ( #30084 )
2024-04-26 13:19:02 +00:00
e845594878
Fix moderator account being exposed in account moderation notification ( #30082 )
2024-04-26 12:42:06 +00:00
4ef0b48b95
Add in-app notifications for moderation actions/warnings ( #30065 )
2024-04-25 17:26:05 +00:00
049b159beb
Add read:me OAuth 2.0 scope, allowing more limited access to user data ( #29087 )
2024-04-23 11:47:00 +00:00
a15139bc02
Fix intermittent order based failure in `UpdateStatusService` spec ( #30008 )
2024-04-22 08:30:38 +00:00
f5d341382e
Add `any_args` to have_enqueued_sidekiq_job call (quiets deprecation) ( #29999 )
2024-04-19 19:44:59 +00:00
11e0049b08
Use enum-generated scopes/queries for `BulkImport` ( #29975 )
2024-04-18 10:13:35 +00:00
8bece467f8
Change `have_enqueued_sidekiq_job` usage to always make argument expectations explicit ( #29974 )
2024-04-17 11:13:52 +00:00
650c548c31
Add `not_featured_by` scope to Tag ( #28815 )
2024-04-17 10:05:38 +00:00
9ce2db4136
Combine double subject runs and DRY up change check in bulk import service spec ( #29402 )
2024-04-17 08:23:25 +00:00
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
7fed4a9740
Pull out repeated setup to shared setup in statusus/show view spec ( #29927 )
2024-04-15 15:24:31 +00:00
61d108f415
Extract `header_tags` method in statuses/show view spec ( #29907 )
2024-04-12 09:50:46 +00:00
da6b9238f5
Expand coverage for admin/metrics/measure/* classes ( #29914 )
2024-04-12 09:38:24 +00:00
ec5a0e0f5e
Expand coverage for admin/metrics/dimension/* classes ( #29913 )
2024-04-12 09:18:35 +00:00
449f99e168
Fix repeated concat output buffer duplicating layout markup ( #29918 )
2024-04-11 23:37:07 +00:00
576554b19b
Use fabrication sequence in domain values ( #29895 )
2024-04-11 08:59:01 +00:00
285f63c02e
Use composable query in `User.active` scope ( #29775 )
2024-04-08 13:53:49 +00:00
babbf6017d
Remove caching in `cache_collection` ( #29862 )
2024-04-08 13:46:13 +00:00
1d1c3a808a
Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream removed a setting textually adjacent to a glitch-soc-only setting.
Removed the setting glitch-soc removed.
2024-04-06 21:01:40 +02:00
777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
903dc53522
Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
67842ffb22
Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream
2024-04-06 19:54:11 +02:00
f2b23aa5f3
Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Upstream added a navigation item while glitch-soc had an additional one.
Ported upstream changes.
2024-04-06 19:35:21 +02:00
e73cf356d2
Move OAuth flow tests from feature tests to system tests ( #29837 )
2024-04-05 16:52:05 +00:00
b61ae28f8d
Separate methods for theme style and meta color tags ( #29802 )
2024-04-05 09:52:43 +00:00
59da591d13
Improve spec for dimension/languages admin metric ( #29842 )
2024-04-05 08:54:11 +00:00
38b9d31f63
Improve email address validation ( #29838 )
2024-04-05 07:48:45 +00:00
1f11aa5f04
Add stub for trending tags in user mailer spec ( #29850 )
2024-04-05 07:48:07 +00:00
191bf5876e
Add coverage for sanitize failure path in api/web/embeds spec ( #29851 )
2024-04-04 16:07:16 +00:00
f87959ab50
Fix `RSpec/LetSetup` cop in api/v1/timelines/public spec ( #28972 )
2024-04-02 14:05:02 +00:00
34489591ec
Add `max_pinned_statuses` to instances serializer and api response ( #29441 )
2024-04-02 13:54:11 +00:00
b4d991adaa
Use integers and not numbers in notification policy API counters ( #29810 )
2024-04-02 10:06:26 +00:00
589e34d00c
Update dependency selenium-webdriver to v4.19.0 ( #29776 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-02 08:53:44 +00:00
9c24f2d6b1
Undo notification permissions on individual and domain blocks ( #29570 )
2024-03-26 14:46:38 +00:00
81a04ac25c
Improve specs for severed relationships ( #29688 )
2024-03-22 16:25:36 +00:00
34f293475e
Fix results/query in `api/v1/featured_tags/suggestions` ( #29597 )
2024-03-22 15:08:27 +00:00
05eda8d193
Remove severed relationship notifications for single account suspensions ( #29700 )
2024-03-21 21:53:24 +00:00
814a48517f
Add some more tests for notification policies ( #29698 )
2024-03-21 16:46:38 +00:00
7434c9c276
Fix the relationships controller spec, since it requires an extra model now ( #29671 )
2024-03-21 08:28:37 +00:00
c0aade79b0
Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream
2024-03-20 18:31:09 +01:00
44bf7b8128
Add notifications of severed relationships ( #27511 )
2024-03-20 15:37:21 +00:00
Claire
Emelia Smith
Matt Jankowski
Jason Punyon
Renaud Chaput
Fawaz Farid
renovate[bot]