Matt Jankowski
bbf7752256
Combine assertions in Notification model spec ( #32015 )
2024-09-23 10:45:34 +00:00
Matt Jankowski
2b4bda8004
Add response_avatar_link helper to webfinger request spec ( #31999 )
2024-09-23 10:44:52 +00:00
Matt Jankowski
447d0a3e88
Remove double no-records cases in api/v1/admin req specs ( #32014 )
2024-09-23 09:27:53 +00:00
Matt Jankowski
66ed7ea4b5
Move status creation to "with rss" context in accounts request spec ( #32020 )
2024-09-23 09:20:43 +00:00
Matt Jankowski
cd7b670cd8
Reduce factory creation in User#reset_password! spec ( #32021 )
2024-09-23 09:18:04 +00:00
Matt Jankowski
0ba3ad4a35
Remove body_json_ids from api/v2/admin/accounts spec ( #32003 )
2024-09-23 08:45:05 +00:00
Matt Jankowski
e0b45b35c9
Combine repeated parsed_body assertions into single ( #32002 )
2024-09-23 08:42:52 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Matt Jankowski
d55f4fbda1
Add content type checks to api/v2 request specs ( #31983 )
2024-09-20 13:19:53 +00:00
Matt Jankowski
171394e914
Add coverage for CSV responses for severed relationships ( #31962 )
2024-09-20 13:13:47 +00:00
Matt Jankowski
66326065b0
Add response.content_type checks for JSON to api/v1 request specs ( #31981 )
2024-09-20 13:13:04 +00:00
Jeremy Kescher
655d28f6a7
Merge remote-tracking branch 'upstream/main' into develop
...
Also apply "Make addReaction and removeReaction optional props", therefore:
Co-authored by: Essem <smswessem@gmail.com>
2024-09-20 11:53:07 +02:00
Matt Jankowski
04a939d640
Add reviewed and unreviewed scopes to Reviewable model concern ( #31988 )
2024-09-20 08:51:37 +00:00
Matt Jankowski
9a03902ab6
Capture actual behavior in v2/notifications "someone else" dismiss scenario ( #31985 )
2024-09-20 08:16:19 +00:00
Matt Jankowski
5a8f2fe31d
Convert settings/exports controller spec to system/request specs ( #31965 )
2024-09-19 13:43:40 +00:00
renovate[bot]
6801afa12f
Update dependency devise-two-factor to v6 [SECURITY] ( #31957 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: David Roetzel <david@roetzel.de>
2024-09-19 10:56:09 +00:00
Matt Jankowski
b071e618e7
Combine API request spec assertions ( #31970 )
2024-09-19 10:15:21 +00:00
Matt Jankowski
e3baa1cdda
Add coverage for AccountDeletionRequest class ( #31937 )
2024-09-18 13:29:57 +00:00
Matt Jankowski
bf8eaaa9a5
Convert controller spec for security_key_options endpoint to request spec ( #31938 )
2024-09-18 09:42:36 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
Matt Jankowski
eb16763bff
Use have_http_link_header matcher in api/v1/trends/* specs ( #31940 )
2024-09-18 08:22:07 +00:00
Matt Jankowski
943738671c
Remove unneeded to_s on Link header comparison in statuses controller spec ( #31941 )
2024-09-18 08:21:31 +00:00
Claire
665e9129fe
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
An upstream refactor touched lines adjacent to ones modified in glitch-soc.
Ported upstream's changes.
2024-09-16 21:08:58 +02:00
Claire
e0648a916a
Rename /api/v2_alpha/notifications* to /api/v2/notifications* ( #31840 )
2024-09-16 12:10:02 +00:00
Matt Jankowski
c54cbf7943
Remove follow creation from ListAccount fabricator ( #31902 )
2024-09-16 08:56:40 +00:00
Matt Jankowski
abd2f5654a
Add validation coverage for CustomEmoji shortcode value ( #31906 )
2024-09-16 07:53:03 +00:00
Matt Jankowski
822e918a56
Add coverage for Bookmark validation and reblog/status check callback ( #31907 )
2024-09-16 07:52:22 +00:00
Claire
4b40d13cb3
Increase preview card image size limit from 2MB to 8MB when using libvips ( #31904 )
2024-09-14 00:16:02 +00:00
Claire
117ac13d12
Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream
2024-09-13 21:37:34 +02:00
David Roetzel
c1b2c4fd9a
Strip protocol from attribution domains ( #31900 )
2024-09-13 11:37:15 +00:00
Claire
ba81e4e019
Fix inability to locally suspend remotely-suspended accounts in moderation interface ( #31899 )
2024-09-13 09:11:10 +00:00
Matt Jankowski
a2c4f5f5c0
Add coverage for ListAccount follow/follow_request set up ( #31896 )
2024-09-13 08:49:03 +00:00
Matt Jankowski
202077517c
Add "search" group for chewy classes in simplecov config ( #31890 )
2024-09-12 20:09:55 +00:00
Claire
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
Claire
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
Claire
90d7a4bac4
Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream
2024-09-12 17:22:06 +02:00
Matt Jankowski
207c073bf8
Remove debug output in migration controller spec ( #31886 )
2024-09-12 14:04:46 +00:00
Taylor Chaparro
1b6a82b799
Fix invalid date searches returning 503 ( #31526 )
2024-09-12 13:40:20 +00:00
Matt Jankowski
4aa600387e
Move redirect/base body class to view ( #31796 )
2024-09-12 13:31:50 +00:00
Christian Schmidt
8cdc148167
Handle invalid visibility ( #31571 )
2024-09-12 13:29:55 +00:00
Matt Jankowski
17c57c46e7
Add coverage for title/limit validations in List model ( #31869 )
2024-09-12 13:25:23 +00:00
Claire
a496aeabcb
Change form-action Content-Security-Policy directive to be more restrictive ( #26897 )
2024-09-12 13:24:19 +00:00
Claire
c35ea59ee6
Fix security context sometimes not being added in LD-Signed activities ( #31871 )
2024-09-12 12:58:12 +00:00
David Roetzel
ab763c493f
Ignore undefined as canonical url ( #31882 )
2024-09-12 11:14:42 +00:00
Claire
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
Eugen Rochko
3d46f47817
Change embedded posts to use web UI ( #31766 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 09:41:19 +00:00
Claire
b240bad61a
Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-soc/merge-upstream
2024-09-11 20:58:35 +02:00
Matt Jankowski
cdcd834f3c
Add coverage for AnnualReport::* source child classes ( #31849 )
2024-09-11 08:01:32 +00:00
Matt Jankowski
cee71b9892
Remove fa_ prefix from status visibility icon method ( #31846 )
2024-09-11 07:47:16 +00:00
Jeremy Kescher
0b66cfbc8d
Merge remote-tracking branch 'upstream/main' into develop
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (ruby) (push) Has been cancelled
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
2024-09-10 16:15:59 +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
Matt Jankowski
d0ab94c4d2
Add FeaturedTag coverage, use pick in model ( #31828 )
2024-09-09 19:57:19 +00:00
Claire
441af2632d
Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream
2024-09-09 18:22:41 +02:00
Mike Dalessio
a0ea2fa3b0
Change fetch link card service to parse as HTML5 ( #31814 )
2024-09-09 10:59:42 +00:00
Matt Jankowski
c6a0768fe5
Use shared system spec helper methods ( #31784 )
2024-09-09 08:01:26 +00:00
Mike Dalessio
afa2e257e4
Change verify link service to use CSS selectors instead of a complex XPath query ( #31815 )
2024-09-08 18:50:22 +00:00
Claire
af6ca96a4e
Fix tests in glitch-soc
2024-09-06 20:00:19 +02:00
Claire
29124990a2
Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream reworked how CSS classes for the document's body are computed.
Slight conflict due to glitch-soc's different theming system.
Updated as upstream did.
2024-09-06 19:25:31 +02:00
Matt Jankowski
4f81ad2494
Add coverage for media#player, move body class to view ( #31790 )
2024-09-06 16:46:25 +00:00
Emelia Smith
c88ba523ee
Fix sort order of moderation notes on Reports and Accounts ( #31528 )
2024-09-06 14:58:36 +00:00
Matt Jankowski
a9d0b48b65
Set "admin" body class from admin nested layout ( #31269 )
2024-09-06 13:58:46 +00:00
Matt Jankowski
6b6a80b407
Remove body_as_json in favor of built-in response.parsed_body for JSON response specs ( #31749 )
2024-09-06 09:58:46 +00:00
Matt Jankowski
7efe0bde9d
Add have_http_link_header matcher and set header values as strings ( #31010 )
2024-09-05 20:05:38 +00:00
Matt Jankowski
09017dd8f0
Add worker spec for annual report worker ( #31778 )
2024-09-05 19:51:17 +00:00
Claire
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
Matt Jankowski
5acec087ca
Simplify basic presence validations ( #29664 )
2024-09-05 15:36:05 +00:00
David Roetzel
f85694acfd
Add credentials to redis sentinel configuration ( #31768 )
2024-09-05 14:06:58 +00:00
Matt Jankowski
e820cc30b8
Convert invites controller spec to system/request specs ( #31755 )
2024-09-05 11:54:27 +00:00
Matt Jankowski
ba9fd1c32e
Add coverage for Account#prepare_contents callback ( #31748 )
2024-09-05 09:48:33 +00:00
David Roetzel
7d91723f05
Support REDIS_SENTINEL_PORT variables ( #31767 )
2024-09-05 09:26:49 +00:00
Matt Jankowski
4d5c91e99a
Remove before block in spec with TODOs which have been TO-DONE already ( #31754 )
2024-09-04 19:51:40 +00:00
Claire
cb1eaa10f2
Fix glitch-soc-only tests
2024-09-04 20:07:23 +02:00
Claire
5a55180b95
Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
glitch-soc had differences in the first few tests because of the wider
subset of HTML it accepts.
Changed `describe` to `RSpec.describe` as upstream did, keeping
glitch-soc's tests.
2024-09-04 19:38:52 +02:00
Matt Jankowski
e1b5f3fc6f
Use response.parsed_body for html response checks ( #31750 )
2024-09-04 17:29:05 +00:00
David Roetzel
ef2bc8ea26
Add redis sentinel support to ruby part of code ( #31744 )
2024-09-04 14:10:45 +00:00
Claire
1fcffa573c
Fix 500 error in GET /api/v2_alpha/notifications when there are no notifications to return ( #31746 )
2024-09-04 12:54:15 +00:00
Matt Jankowski
14af5b47ac
Add coverage for model normalizations ( #31734 )
2024-09-04 05:12:40 +00:00
Matt Jankowski
9ed1aab9b7
Remove accidental matcher debug code ( #31732 )
2024-09-04 05:12:35 +00:00
Matt Jankowski
f1003b2560
Enable "zero monkey patching" mode in RSpec ( #31614 )
2024-09-04 05:12:25 +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
c9ea91f868
Add coverage for api/v1/annual_reports area ( #31730 )
2024-09-03 16:10:48 +00:00
Matt Jankowski
19849eb91d
Skip paperclip spoof detector unless opted into attachment processing specs ( #31454 )
2024-09-03 15:39:19 +00:00
Matt Jankowski
69dbc23038
Only enable chewy in search-tagged specs ( #30583 )
2024-09-03 15:38:38 +00:00
Matt Jankowski
7c26e5e4a1
Add Reviewable model concern ( #31152 )
2024-09-03 15:37:45 +00:00
Matt Jankowski
2f0d0fc127
Add coverage for CLI::Accounts#fix_duplications task ( #30639 )
2024-09-03 15:36:59 +00:00
Matt Jankowski
e1fa456c7c
Add have_cacheable_headers matcher for responses ( #31727 )
2024-09-03 15:35:19 +00:00
Matt Jankowski
490bdb7944
Add coverage for StatusesHelper#media_summary method ( #31726 )
2024-09-03 15:34:09 +00:00
Matt Jankowski
8922786ef4
Fix RSpec/LetSetup cop in api/v1/timelines/tag spec ( #30796 )
2024-09-03 15:32:12 +00:00
Matt Jankowski
67faaf5557
Simplify account model username presence validation spec ( #31013 )
2024-09-03 15:30:57 +00:00
Matt Jankowski
fcb83be8b2
Improve coverage specificity for Webhook enable/disable/secret specs ( #31194 )
2024-09-03 15:30:13 +00:00
Matt Jankowski
928390c2ba
Convert admin/settings controller specs to system specs ( #31548 )
2024-09-03 15:29:32 +00:00
Matt Jankowski
ef4920c6c9
Pull out https/hostname setup for request specs to shared config ( #31622 )
2024-09-03 15:28:57 +00:00
Matt Jankowski
79b1841805
Disable without_verify_partial_doubles in statuses/show view spec ( #29132 )
2024-09-03 15:23:57 +00:00
Matt Jankowski
5b595b8a5a
Remove usage of assigns in controller specs ( #30195 )
2024-09-03 15:23:16 +00:00
Claire
ea0d691e19
Add GET /api/v2_alpha/notifications/:group_key/accounts ( #31725 )
2024-09-03 14:32:26 +00:00
Matt Jankowski
219458d7d4
Convert tags controller spec to system and request specs ( #31708 )
2024-09-03 13:18:53 +00:00
Claire
ac4002fe08
Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-soc/merge-upstream
2024-09-03 12:12:23 +02:00
Matt Jankowski
31c00108a4
Add first pass coverage for AnnualReport class ( #31704 )
2024-09-03 09:05:26 +00:00
Matt Jankowski
b8957241af
Add coverage for JsonLdHelper#uri_from_bearcap method ( #31700 )
2024-09-03 08:41:11 +00:00
Matt Jankowski
25bbb01666
Remove unused helper method in spec ( #31699 )
2024-09-03 08:04:22 +00:00
Matt Jankowski
24a0b20408
Use body_as_json directly instead of via local var assignment ( #31696 )
2024-09-03 08:03:08 +00:00
Christian Schmidt
a5bbe83dfd
media_ids is an array of strings ( #31709 )
2024-09-02 20:18:09 +00:00
Claire
402c1e116d
Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream
2024-09-02 17:43:10 +02:00
Christian Schmidt
491033c86c
Reject status creation with invalid media_ids parameter ( #31681 )
2024-09-02 15:30:48 +00:00
Matt Jankowski
40f993b3a0
Use built-in response.parsed_body for JSON response specs ( #31674 )
2024-09-02 14:25:21 +00:00
David Roetzel
388d5473e1
Refactor (ruby) redis configuration ( #31694 )
2024-09-02 14:19:55 +00:00
Claire
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
Jeremy Kescher
9c355a240b
Merge remote-tracking branch 'upstream/main' into develop
2024-08-31 12:53:19 +02:00
Matt Jankowski
1ee1c329cc
Convert admin/announcements controller spec to system spec ( #31655 )
2024-08-30 07:15:28 +00:00
Claire
ad0a28a8bf
Add grouped_types parameter to allow clients to restrict which notifications types get grouped ( #31594 )
2024-08-29 12:39:07 +00:00
Matt Jankowski
02585d8789
Convert media controller spec to request spec ( #31634 )
2024-08-29 08:46:00 +00:00
Matt Jankowski
b9269c8d38
Convert admin/reset controller spec to system spec ( #31643 )
2024-08-29 08:38:17 +00:00
Matt Jankowski
0ef636f72d
Convert shares controller spec to system spec ( #31619 )
2024-08-28 07:58:40 +00:00
Matt Jankowski
00586d27cb
Convert instance_actor controller spec to request spec ( #31621 )
2024-08-28 07:56:07 +00:00
Claire
94d8cdc494
Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream
2024-08-27 20:00:07 +02:00
Matt Jankowski
3959f36d19
Add checks about response body content to admin/dash spec ( #30716 )
2024-08-27 14:59:56 +00:00
Matt Jankowski
48f4e5444d
Convert media_proxy controller spec to request spec ( #31600 )
2024-08-27 09:44:16 +00:00
Matt Jankowski
a7f8417795
Convert "CSV export" settings controller specs to request specs ( #31601 )
2024-08-27 08:12:39 +00:00
Matt Jankowski
38a3466741
Convert api/oembed controller spec to request spec ( #31605 )
2024-08-27 07:55:25 +00:00
Matt Jankowski
c09d232ee3
Convert api/web/settings controller spec to request spec ( #31606 )
2024-08-27 07:42:35 +00:00
Matt Jankowski
14d7fe05d0
Use describe instead of context in top-level spec declaration ( #31607 )
2024-08-27 07:40:18 +00:00
Claire
8f678a3cf4
Fix tests for glitch-soc
2024-08-26 19:08:42 +02:00
Claire
11b8017b45
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream
2024-08-26 18:52:33 +02:00
Jeremy Kescher
7df41062ba
Merge branch 'glitch' into develop
2024-08-26 18:31:12 +02:00
Matt Jankowski
4c2534d12e
Convert "static page" controller specs to system specs ( #31599 )
2024-08-26 15:53:48 +00:00
Matt Jankowski
dbe0ee8a81
Convert emojis controller spec to request spec ( #31597 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-08-26 15:00:05 +00:00
Matt Jankowski
5172d84946
Convert manifest controller spec to request spec ( #31596 )
2024-08-26 14:37:23 +00:00
Matt Jankowski
36ccdcc9e1
Convert "custom css" controller spec to request spec ( #31595 )
2024-08-26 14:36:31 +00:00
Matt Jankowski
641ae6a2cf
Convert health check endpoint controller spec to request spec ( #31565 )
2024-08-26 12:17:35 +00:00
Matt Jankowski
bcc4b1078c
Fix Rails/RootPathnameMethods cop ( #31582 )
2024-08-26 07:35:07 +00:00
Claire
d0529b810a
Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream
2024-08-24 12:06:31 +02:00
David Roetzel
0374918746
Add spec for doorkeeper behavior around issuing tokens ( #31545 )
2024-08-23 08:20:32 +00:00
Claire
18556d3e9b
Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream refactored some helpers and moved them in another file.
Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
Kept glitch-soc definitions where they are and moved upstream ones
as upstream did.
2024-08-22 19:54:20 +02:00
Renaud Chaput
4a968cb7a9
Add icon field to instance endpoint ( #30205 )
2024-08-22 10:04:27 +00:00
Claire
0cec9077a4
Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Upstream added a test for a new attribute, next to a line we modified
in glitch-soc because of a different default value.
Updated as upstream's did, keeping glitch-soc's default value.
2024-08-21 18:44:21 +02:00
Claire
19a1acb38b
Add api_versions to /api/v2/instance ( #31354 )
2024-08-21 14:54:59 +00:00
Claire
f5c0c32edd
Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
Glitch-soc used this one but not upstream.
Upstream pulled a presumably more up-to-date version of the file.
Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/error.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
2024-08-20 18:31:50 +02:00
Matt Jankowski
f91403ccaa
Remove unused fa_icon helper method ( #31511 )
2024-08-20 15:59:59 +00:00
Claire
711e1fce0a
Fix pagination parameters in GET /api/v2_alpha/notificatins ( #31509 )
2024-08-20 13:54:08 +00:00
Matt Jankowski
fa2e7b1708
Migrate fontawesome->material in more views ( #31360 )
2024-08-20 11:52:45 +00:00
Claire
1760f84349
Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream
2024-08-19 18:25:31 +02:00
Claire
53c183f899
Reload notifications when accepted notifications are merged (streaming only) ( #31419 )
2024-08-19 15:59:06 +00:00
Edward Moulsdale
d4f135bc6d
Fix in memoriam accounts appearing in follow recommendations ( #31474 )
...
Co-authored-by: Utkarsh Wankar <46633523+kernal053@users.noreply.github.com>
2024-08-19 15:55:42 +00:00
Claire
d2e4be0456
Hopefully fix notifications pagination flaky test ( #31494 )
2024-08-19 14:53:54 +00:00
Jeremy Kescher
08e538f8a4
Merge branch 'glitch' into develop
2024-08-16 16:05:14 +02:00
Claire
9f2775830c
Merge commit '5d04e297755c4a8b4e908f706d272520521341d4' into glitch-soc/merge-upstream
2024-08-15 21:58:04 +02:00
Renaud Chaput
5d04e29775
Disable Chrome's search engine selection screen when running system specs ( #31437 )
2024-08-15 06:45:00 +00:00
Renaud Chaput
4545b8d6cb
Add the ability to ignore specific browser errors for a spec ( #31436 )
2024-08-15 06:44:13 +00:00
Claire
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
Jeong Arm
95c11d365d
Don't push to cache buster if attachment path is nil ( #31414 )
2024-08-14 08:57:42 +00:00
