Matt Jankowski
832b92ac3e
Add attachment check to spec/service/suspend_account_service spec ( #28619 )
2024-01-08 11:05:10 +00:00
Matt Jankowski
12bed81187
Add validation specs to CustomFilter
model ( #28600 )
2024-01-05 15:13:59 +00:00
Claire
6ad0fb5a77
Fix NULL MX handling and tighten DNS resolving specs ( #28607 )
2024-01-05 11:07:57 +00:00
Claire
5f4643b895
Add PAPERCLIP_ROOT_URL
to Content-Security-Policy when used ( #28561 )
2024-01-05 10:45:36 +00:00
Matt Jankowski
964a0ecf37
Add sleep statement to nudge thread scheduler in request pool spec ( #28596 )
2024-01-04 16:55:00 +00:00
Matt Jankowski
f06c1f1552
Fix Capybara/ClickLinkOrButtonStyle
cop in spec/features ( #28576 )
2024-01-04 09:20:32 +00:00
Claire
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
2024-01-04 09:07:05 +00:00
Claire
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
2024-01-03 20:52:19 +01:00
Matt Jankowski
f92d8c654d
Standardize on Thor methods in CLI classes ( #28566 )
2024-01-03 15:08:08 +00:00
Matt Jankowski
5c769de096
Add spec coverage for CLI::Media#remove_orphans
command ( #28267 )
2024-01-03 14:12:56 +00:00
Matt Jankowski
74a0d81e90
Add coverage for CLI self-destruct
command ( #28565 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-03 13:06:38 +00:00
Claire
9d9008666b
Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream
2024-01-03 12:38:49 +01:00
Claire
092bb8a27a
Fix Mastodon not correctly processing HTTP Signatures with query strings ( #28476 )
2024-01-03 11:29:26 +00:00
Claire
bd415af9a1
Change streaming API host to not be overridden to localhost in development mode ( #28557 )
2024-01-03 10:23:58 +00:00
Claire
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
2023-12-28 16:57:10 +01:00
Claire
19e14654cc
Reduce CSP configuration changes with upstream ( #2536 )
2023-12-27 09:54:05 +01:00
Claire
a2624ff739
Convert signature verification specs to request specs ( #28443 )
2023-12-22 18:56:22 +00:00
Claire
ea6c187fca
Fix media attachment order of remote posts ( #28469 )
2023-12-22 18:45:36 +01:00
Matt Jankowski
bb8077e784
Fix RSpec/LetSetup
cop in models/account_status_cleanup_policy ( #28470 )
2023-12-22 15:29:50 +00:00
Claire
2bf84b93d4
Fix media attachment order of remote posts ( #28469 )
2023-12-22 15:10:39 +00:00
Matt Jankowski
a4d49c236d
Fix RSpec/LetSetup
cop in ap/fetch_featured_collection_service ( #28461 )
2023-12-22 12:57:29 +00:00
Matt Jankowski
e6e217fedd
Clean up tagged_with_*
Status specs, fix RSpec/LetSetup
cop ( #28462 )
2023-12-22 08:32:27 +00:00
Matt Jankowski
513d35969e
Fix RSpec/LetSetup
cop in auth controller specs ( #28464 )
2023-12-22 08:03:59 +00:00
Claire
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
2023-12-21 19:42:13 +01:00
Claire
30ee7339d3
Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream changed code style change, including on a line modified by glitch-soc.
Kept glitch-soc's line but with the code style change applied.
2023-12-21 19:31:12 +01:00
Claire
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
2023-12-21 19:24:10 +01:00
Claire
6e56f95285
Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream modified its README, we have a completely different one.
Kept our README file.
2023-12-21 18:17:17 +01:00
Matt Jankowski
9251779d75
Fix RSpec/LetSetup
cop in spec/services ( #28459 )
2023-12-21 14:23:53 +00:00
Matt Jankowski
efd16f3c2c
Clean up of RSpec/LetSetup
within spec/services/activitypub
( #28445 )
2023-12-21 11:20:12 +00:00
Matt Jankowski
c99f88e1a8
Clean up of RSpec/LetSetup
within spec/lib
( #28447 )
2023-12-21 11:19:56 +00:00
Matt Jankowski
cd64a5b2ec
Clean up of RSpec/LetSetup
within api/
( #28448 )
2023-12-21 10:10:18 +00:00
Matt Jankowski
f32d672d2f
Clean up of RSpec/LetSetup
within spec/controllers
( #28446 )
2023-12-21 09:28:41 +00:00
Matt Jankowski
c753b1ad35
Clean up of RSpec/LetSetup
within spec/models
( #28444 )
2023-12-21 09:18:38 +00:00
Matt Jankowski
2463b53363
More duplicates in cli maintenance spec, misc bug fixes ( #28449 )
2023-12-21 08:51:03 +00:00
Claire
077e0c6812
Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict caused by the `json` gem thing once again.
Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored a bunch of specs, including one place that differs
because of glitch-soc's theming system.
Refactored as upstream did, adapting it for glitch-soc's theming system.
2023-12-20 22:16:50 +01:00
Claire
75580360cd
Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
`Metrics/AbcSize` cop.
Glitch-soc has different code and slightly higher `AbcSize` complexity,
modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
Upstream changed `account.suspended?` to `account.unavailable?` to prepare
for delete flags. Glitch-soc has additional local-only conditions.
Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
Upstream refactored a bunch of stuff while glitch-soc has more settings.
Refactored as upstream did while keeping glitch-soc's settings.
2023-12-20 22:05:31 +01:00
Claire
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
2023-12-20 21:58:18 +01:00
Claire
b8209c3b96
Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
Matt Jankowski
961d65aba6
Add coverage to CLI Maintenance for duplicate users on confirmation_token
and reset_password_token
values ( #28434 )
2023-12-20 08:54:04 +00:00
Claire
b135b6ba8f
Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Conflict caused by glitch-soc having a different file size limit constant
name.
Updated like upstream did while keeping glitch-soc's constant name.
2023-12-19 21:24:01 +01:00
Claire
6c00d5b0c4
Fix test failure caused by glitch-soc changes
2023-12-19 21:14:39 +01:00
Claire
2e786e13cb
Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_pin_validator.rb`:
Upstream refactored that file, while glitch-soc had configurable limits for
pinned statuses.
Updated the code with upstream's refactor, while keeping glitch-soc's
configurability.
2023-12-19 20:51:37 +01:00
Claire
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
2023-12-19 20:40:05 +01:00
Claire
b24f676cf1
Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream
2023-12-19 20:24:57 +01:00
Claire
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
2023-12-19 20:17:23 +01:00
Claire
8afd313807
Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
- `yarn.lock`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
2023-12-19 20:06:32 +01:00
Claire
6fed0fcbaa
Remove unneeded settings cleanup from specs ( #28425 )
2023-12-19 15:17:22 +00:00
Matt Jankowski
c7c727994a
Add spec for CLI::Maintenance#fix_duplicates
( #28326 )
2023-12-19 13:10:33 +00:00
Eugen Rochko
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-19 10:59:43 +00:00
Matt Jankowski
c28976d89e
Handle negative offset param in api/v2/search
( #28282 )
2023-12-19 10:55:39 +00:00
Claire
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
2023-12-18 20:47:27 +01:00
Claire
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
2023-12-18 19:10:43 +01:00
Claire
b474cbbd28
Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
We differed by listing suspended users when requesting relationships.
Updated to upstream's code.
2023-12-18 18:40:58 +01:00
Claire
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
2023-12-18 18:34:25 +01:00
Claire
bc33be0342
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
Kept our version of `json-ld` while updating other dependencies.
2023-12-18 18:07:24 +01:00
Matt Jankowski
476d1237d4
Typo fix in json ld helper spec ( #28417 )
2023-12-18 16:47:22 +00:00
Claire
7d9b209fe8
Fix call to inefficient delete_matched
cache method in domain blocks ( #28374 )
2023-12-18 16:14:43 +00:00
Matt Jankowski
af366f65ee
Add spec coverage for models/form/custom_emoji_batch
class ( #28388 )
2023-12-18 12:41:37 +00:00
Matt Jankowski
1820bad646
Fix Performance/StringIdentifierArgument
cop ( #28399 )
2023-12-18 10:26:09 +00:00
Claire
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
Claire
ddf3ad9541
Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
...
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
2023-12-17 17:43:30 +01:00
Claire
1474318691
Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
2023-12-17 15:32:29 +01:00
Matt Jankowski
b1dec09d20
Fix Style/InverseMethods
cop ( #28377 )
2023-12-15 15:52:00 +00:00
Matt Jankowski
db897eaa5a
Unwind map
on single-item array in spec/services/delete_account_service
spec ( #28358 )
2023-12-14 14:07:54 +00:00
Matt Jankowski
ef9797a395
Un-nest contexts in settings/2fa/webauthn
spec ( #28359 )
2023-12-14 10:46:43 +00:00
Matt Jankowski
adbfd40a1b
Convert api/v1/directories
controller spec to request spec ( #28356 )
2023-12-14 10:38:06 +00:00
Matt Jankowski
28e1a7a394
Improve spec coverage for models/announcement
class ( #28350 )
2023-12-14 10:29:10 +00:00
Matt Jankowski
8a3d8c6c14
Remove the stub_stdout
wrapper around CLI specs ( #28340 )
2023-12-13 10:14:19 +00:00
Claire
89a496b42f
Fix status edits not always being streamed to mentioned users ( #28324 )
2023-12-12 10:39:21 +00:00
Matt Jankowski
b5a1013ae3
Combine CLI::...
spec example subjects ( #28285 )
2023-12-11 10:23:45 +00:00
Matt Jankowski
0e4233de9d
Controller spec to request spec: api/v2/suggestions
( #28297 )
2023-12-11 08:13:57 +00:00
Matt Jankowski
0c64092500
Controller spec to request spec: api/v1/accounts/search
( #28299 )
2023-12-11 08:13:28 +00:00
Matt Jankowski
16ede59d0a
Controller spec to request spec: api/v1/featured_tags/suggestions
( #28298 )
2023-12-11 08:00:41 +00:00
Matt Jankowski
809506bdd4
Controller spec to request spec: api/v1/accounts/pins
( #28300 )
2023-12-11 07:59:40 +00:00
Matt Jankowski
94cc707ab3
Controller spec to request spec: api/v1/accounts/notes
( #28301 )
2023-12-11 07:58:48 +00:00
Matt Jankowski
e544b6df42
Controller spec to request spec: api/v1/accounts/lookup
( #28302 )
2023-12-11 07:57:33 +00:00
Matt Jankowski
a968898dc7
Controller spec to request spec: api/v1/accounts/lists
( #28303 )
2023-12-11 07:56:47 +00:00
Matt Jankowski
8f94502e7d
Controller spec to request spec: api/v1/accounts/identify_proofs
( #28304 )
2023-12-11 07:56:13 +00:00
Matt Jankowski
78347d2556
Controller spec to request spec: api/v1/accounts/familiar_followers
( #28305 )
2023-12-11 07:55:45 +00:00
Matt Jankowski
11d2bd9716
Fix intermittent failure from unspecified order in api/v1/accounts/relationships
spec ( #28306 )
2023-12-11 07:55:07 +00:00
Claire
9f92b05bd2
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
2023-12-10 18:05:02 +01:00
Matt Jankowski
a3cbb4b2f1
Add spec for CLI::Search#deploy
command ( #28272 )
2023-12-08 13:54:20 +00:00
Matt Jankowski
8de86eabbf
Add spec for CLI::Domains#crawl
command ( #28271 )
2023-12-08 09:51:57 +00:00
Matt Jankowski
7e514688b3
Convert api/v2/search
controller spec to request spec ( #28269 )
2023-12-08 09:27:33 +00:00
Matt Jankowski
8d8ae05a18
Add spec coverage for CLI::Media#lookup
command ( #28266 )
2023-12-07 15:27:41 +00:00
Matt Jankowski
ad34d33bfd
Formalize some patterns in cli specs ( #28255 )
2023-12-07 13:49:14 +00:00
Matt Jankowski
0b4a3a0437
Remove remaining without_partial_double_verification
usage ( #28127 )
2023-12-07 12:15:50 +00:00
Claire
658ad7a6ca
Fix flaky tests related to file creation ( #28248 )
2023-12-06 22:22:25 +00:00
Matt Jankowski
0e8ba19113
Add spec coverage for CLI::Emoji
class ( #28182 )
2023-12-06 08:52:30 +00:00
Matt Jankowski
ed7b5c091b
Remove double subject call in services/delete_account_service
spec ( #28212 )
2023-12-06 08:51:09 +00:00
Matt Jankowski
be6bb1a10d
Remove double subject call in services/suspend_account_service
spec ( #28213 )
2023-12-06 08:45:19 +00:00
Matt Jankowski
5517df61de
Remove double subject call in services/activitypub/process_account_service
spec ( #28214 )
2023-12-06 08:44:51 +00:00
Matt Jankowski
faffd81976
Remove double subject call in services/unsuspend_account_service
spec ( #28215 )
2023-12-06 08:44:07 +00:00
Matt Jankowski
89a8e6e622
Remove 2x double subject call in models/form/account_batch
spec ( #28209 )
2023-12-04 15:41:43 +00:00
Matt Jankowski
71e5a16eba
Remove triple subject call in api/v1/lists
spec ( #28210 )
2023-12-04 15:28:19 +00:00
Matt Jankowski
cca19f5fbb
Use the Admin::ActionLog
fabricator in admin/action_logs spec ( #28194 )
2023-12-04 12:56:28 +00:00
Matt Jankowski
b3b009e6aa
Add spec coverage for CLI::EmailDomainBlocks
commands ( #28181 )
2023-12-04 09:44:54 +00:00
Matt Jankowski
9603198982
Add spec coverage for CLI::Domains#purge
command ( #28179 )
2023-12-04 09:09:05 +00:00
Matt Jankowski
1bf2230fd1
Add spec coverage for CLI::Upgrade#storage_schema
command ( #28180 )
2023-12-04 09:08:47 +00:00
Matt Jankowski
19ad51253d
Prevent triple-subject run in admin/domain_blocks spec ( #28195 )
2023-12-04 09:02:40 +00:00
Matt Jankowski
d848d8d87c
Add helper methods for domains allow and export blocks files ( #28196 )
2023-12-04 08:52:21 +00:00
Matt Jankowski
5631f139c1
Fix Lint/SymbolConversion
cop ( #28175 )
2023-12-01 15:53:35 +00:00
Matt Jankowski
aa8563d43d
Fix Style/SuperWithArgsParentheses
cop ( #28174 )
2023-12-01 15:53:15 +00:00
Matt Jankowski
1564799952
Add spec coverage for media CLI refresh
command ( #28166 )
2023-12-01 14:18:45 +00:00
Matt Jankowski
7753e5f715
Add shared example for CLI command specs ( #28165 )
2023-12-01 12:00:34 +00:00
Matt Jankowski
92fa9b109f
Add spec coverage for media CLI usage command ( #28167 )
2023-12-01 11:56:47 +00:00
Matt Jankowski
440b80b2e7
Model concerns organization into module namespaces ( #28149 )
2023-12-01 11:00:41 +00:00
Matt Jankowski
b751078fcd
Eliminate double subject call in admin/ controller specs ( #28158 )
2023-12-01 10:38:15 +00:00
Matt Jankowski
1f1c75bba5
File cleanup/organization in controllers/concerns
( #27846 )
2023-11-30 14:39:41 +00:00
Matt Jankowski
0530ce5e95
Convert accounts controller spec to request spec ( #28126 )
2023-11-30 14:28:05 +00:00
Matt Jankowski
e7c340a634
Spec coverage for missing q
param and error conditions in api/v2/search
controller ( #27842 )
2023-11-30 13:59:46 +00:00
Claire
85662a5a57
Change img-src
and media-src
CSP directives to not include https:
( #28025 )
2023-11-30 13:47:01 +00:00
Matt Jankowski
bb0efe16e6
Remove default_scope
from MediaAttachment
class ( #28043 )
2023-11-30 13:30:35 +00:00
Matt Jankowski
ce78a9c9ac
Clean up two_factor_authentication/confirmations
controller spec ( #28128 )
2023-11-30 11:44:42 +00:00
Filippo Giunchedi
e6fd9a59e6
Fix FamiliarFollowersController test response comparison ( #28121 )
...
Co-authored-by: Filippo Giunchedi <filippo@debian.org>
2023-11-30 10:58:40 +00:00
Matt Jankowski
e48ecd2929
Remove default_scope
from Admin::ActionLog
( #28026 )
2023-11-29 10:39:59 +00:00
Matt Jankowski
291dc04e67
Remove un-needed action
and template
options to render
in controllers ( #28022 )
2023-11-29 10:38:05 +00:00
Emelia Smith
603b245cc6
Add VAPID public key to instance serializer ( #28006 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-11-29 08:34:36 +00:00
Matt Jankowski
6b46bf9953
Handle scenario when webfinger response subject
is missing host value ( #28088 )
2023-11-28 18:37:54 +00:00
Claire
660372d130
Revert recent CSP changes ( #2485 )
...
* Revert "Fix image and media loading when using external storage server"
This reverts commit 6cfa0245ca
.
* Revert "Change glitch-soc's CSP config to match upstream's closer (#2474 )"
This reverts commit d59196e170
.
2023-11-26 15:32:35 +01:00
Matt Jankowski
19baf22683
Add missing email previews for AdminMailer
( #28044 )
2023-11-23 12:32:50 +00:00
Kevin Bongart
7877fcd83c
Deduplicate IDs in relationships and familiar_followers APIs ( #27982 )
2023-11-23 10:00:09 +00:00
Matt Jankowski
973597c6f1
Consolidate configuration of Sidekiq::Testing.fake!
setup ( #28046 )
2023-11-23 09:43:43 +00:00
Matt Jankowski
9742bccbe7
Add coverage for api/v2/media
endpoint ( #28027 )
2023-11-22 15:39:34 +00:00
Eugen Rochko
cdc57c74b7
Fix unsupported time zone or locale preventing sign-up ( #28035 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-22 11:38:07 +00:00
Matt Jankowski
67fd3187b3
Update rspec fixture path config to silence deprecation warning ( #28018 )
2023-11-21 15:51:40 +00:00
Matt Jankowski
30ee4aaff4
Convert measurement api/v1/admin/*
controller specs to request specs ( #28005 )
2023-11-21 14:25:07 +00:00
Matt Jankowski
32e19e3af6
Reduce .times
usage in request and controller specs ( #27949 )
2023-11-21 13:05:59 +00:00
Matt Jankowski
f7cb64a184
Add coverage for settings/privacy
controller ( #28000 )
2023-11-21 13:02:37 +00:00
Claire
6cfa0245ca
Fix image and media loading when using external storage server
...
Fixes #2479
2023-11-21 13:45:29 +01:00
Matt Jankowski
b2e8af8889
Add coverage for settings/verifications
controller ( #28001 )
2023-11-21 11:00:22 +00:00
Matt Jankowski
6d51ac246b
Update partials for the AdminMailer.new_trends
mailer ( #28011 )
2023-11-21 10:52:20 +00:00
Matt Jankowski
a6d446e6a7
Add coverage for remote_interaction_helper
( #28002 )
2023-11-21 10:28:55 +00:00
Claire
d59196e170
Change glitch-soc's CSP config to match upstream's closer ( #2474 )
2023-11-20 13:02:49 +01:00
Matt Jankowski
876f5b1d12
Convert /instances/*
controller specs to request specs ( #27988 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-20 11:05:28 +00:00
Matt Jankowski
718c95e7af
Convert api/v1/custom_emojis
controller spec to request spec ( #27985 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-20 11:05:24 +00:00
Claire
c260a68f54
Clean up some Mastodon::CLI::Accounts
tests ( #27473 )
2023-11-20 10:46:02 +00:00
Matt Jankowski
17582d36d5
Convert api/v1/preferences
controller spec to request spec ( #27987 )
2023-11-20 09:39:45 +00:00
Matt Jankowski
9a01a260a0
Convert api/v1/scheduled_statuses
controller spec to request spec ( #27986 )
2023-11-20 09:36:49 +00:00
Matt Jankowski
b9fb47aeb1
Convert api/v1/endorsements
controller spec to request spec ( #27984 )
2023-11-20 09:32:28 +00:00
Matt Jankowski
371f355719
Reduce .times
usage in AccountStatusesCleanupPolicy
( #27947 )
2023-11-20 09:08:54 +00:00
Matt Jankowski
d2aacea8da
Reduce .times
usage in AccountSearch spec, use constant for default limit ( #27946 )
2023-11-20 09:08:22 +00:00
Matt Jankowski
00c6ebd86f
Reduce .times
usage in StatusPin
and add PIN_LIMIT
constant in validator ( #27945 )
2023-11-20 09:07:25 +00:00
Matt Jankowski
1fabf20a88
Reduce .times
usage in lib/mastodon/cli/accounts
spec ( #27944 )
2023-11-20 09:04:46 +00:00
Matt Jankowski
09a2db3f6c
Move api/v2/filters spec to correct path location ( #27950 )
2023-11-20 08:48:56 +00:00
Matt Jankowski
e892efbc40
Configure elastic search integration with rspec tag ( #27882 )
2023-11-17 11:52:20 +00:00
Claire
297839c10c
Rewrite /api/v1/statuses
tests as request specs ( #27891 )
2023-11-17 11:36:04 +00:00
Claire
9257737675
Rewrite /api/v1/accounts
tests as request specs ( #27888 )
2023-11-17 11:34:49 +00:00
Matt Jankowski
549e8e7baf
Add email_spec
and speedup/cleanup to spec/mailers
( #27902 )
2023-11-17 09:50:19 +00:00
Matt Jankowski
1526e54ac6
Add spec coverage for workers/redownload_*
worker classes ( #27892 )
2023-11-17 09:03:46 +00:00
Matt Jankowski
cb1a4a8713
Reduce expectations for RSpec/MultipleExpectations
cop in spec/presenters
specs ( #27881 )
2023-11-16 14:37:52 +00:00
Matt Jankowski
155fb84141
Improve spec coverage for collection of workers/
classes ( #27874 )
2023-11-16 14:36:59 +00:00
Matt Jankowski
8a285413f7
Reduce expectations for RSpec/MultipleExpectations
cop in MoveWorker
spec ( #27880 )
2023-11-16 10:03:51 +00:00
Matt Jankowski
3f0c1566c3
Reduce expectations for RSpec/MultipleExpectations
cop in api/v1/accounts/relationships
spec ( #27879 )
2023-11-16 09:55:50 +00:00
Matt Jankowski
c1f93def40
Reduce expectations for RSpec/MultipleExpectations
cop in controllers/statuses
spec ( #27875 )
2023-11-16 09:54:51 +00:00
Matt Jankowski
04121bd020
Disable simplecov enable_coverage_for_eval
option, move to standalone file ( #27869 )
2023-11-15 23:09:31 +00:00
Matt Jankowski
3de9145613
Move controller specs for well-known
endpoints to request specs ( #27855 )
2023-11-15 19:12:02 +00:00
Matt Jankowski
12a5b7391d
Add spec for well known change password endpoint ( #27856 )
2023-11-15 13:21:18 +00:00
Matt Jankowski
fe58ac8d9f
Improve spec coverage for api/web/push_subscriptions
controller ( #27858 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 13:14:51 +00:00
Matt Jankowski
7c72944661
Use Lcov
simplecov formatter on CI and HTML
elsewhere ( #27859 )
2023-11-15 09:11:02 +00:00
Nick Schonning
36d7d1781f
Add CodeCov for Ruby coverage reports ( #23868 )
2023-11-14 16:53:38 +00:00
Matt Jankowski
b2c5b20ef2
Fix RSpec/AnyInstance
cop ( #27810 )
2023-11-14 14:52:59 +00:00
Matt Jankowski
d562fb8459
Specs for minimal CSP policy in Api::
controllers ( #27845 )
2023-11-14 14:34:30 +00:00
Matt Jankowski
5e2ecc736d
Remove double subject
in api/v1/accounts/relationships spec ( #27839 )
2023-11-14 10:29:33 +00:00
Matt Jankowski
b7807f3d84
Use normalizes
to prepare Webhook#events
value ( #27605 )
2023-11-13 22:47:44 +00:00
Matt Jankowski
49ba5a9f94
Use hash_including
to check AccountFilter
setup in admin/accounts
controller spec ( #27838 )
2023-11-13 16:01:24 +00:00
Matt Jankowski
a36b59be8a
Spec coverage for api/v1/trends
controllers ( #27837 )
2023-11-13 14:32:36 +00:00
Claire
07a4059901
Add support for invite codes in the registration API ( #27805 )
2023-11-13 13:27:00 +00:00
Eugen Rochko
0d14fcebae
Change link previews to keep original URL from the status ( #27312 )
2023-11-13 09:58:28 +00:00
Matt Jankowski
9dc3ce878b
Speed-up in Settings::
controllers specs ( #27808 )
2023-11-10 15:13:42 +00:00
Matt Jankowski
e79bf1b1e7
Minor speed improvement on controllers/accounts
spec ( #27679 )
2023-11-09 16:21:11 +00:00
Claire
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
2023-11-09 14:50:25 +00:00
Matt Jankowski
548bb30b2a
Consolidate html page title output logic into helper ( #27563 )
2023-11-09 13:05:57 +00:00
Matt Jankowski
63c9102f8a
Fix RSpec/MessageChain
cop ( #27776 )
2023-11-09 12:57:23 +00:00
Matt Jankowski
c9204b792c
Fix Rails/I18nLocaleTexts
cop ( #27779 )
2023-11-09 09:46:39 +00:00
Matt Jankowski
69d00e2721
Fix RSpec/InstanceVariable
cop ( #27766 )
2023-11-08 15:42:30 +00:00
Matt Jankowski
4329616c53
Ignore block result of send
method and remove rubocop:disable
in deepl spec ( #27741 )
2023-11-08 14:43:17 +00:00
Matt Jankowski
b05575e242
Move RSpec config for streaming/search managers to be near classes ( #27761 )
2023-11-08 13:04:17 +00:00
Matt Jankowski
ce91d14d48
Fix Style/WordArray
cop ( #27770 )
2023-11-08 13:03:44 +00:00
Matt Jankowski
c03bd2a238
Don't stub SUT in FollowLimitValidator
spec ( #27760 )
2023-11-08 12:49:46 +00:00
Matt Jankowski
9b7b4d748f
Simplify request cache spec shared examples ( #27673 )
2023-11-08 12:37:29 +00:00
Claire
23e32a4b30
Fix format-dependent redirects being cached regardless of requested format ( #27632 )
2023-11-08 10:31:05 +00:00
Matt Jankowski
e545978076
Use framework helpers instead of i-vars in controller specs ( #27767 )
2023-11-08 08:17:43 +00:00
Matt Jankowski
ee57bb4b44
Account statuses filter spec speedup ( #27674 )
2023-11-07 15:47:01 +00:00
Matt Jankowski
ae7c20b00c
Move search and streaming spec manager classes to separate support files ( #27727 )
2023-11-07 15:25:49 +00:00
Matt Jankowski
370802ce48
Add coverage for CLI::Maintenance#fix_duplicates
command ( #25252 )
2023-11-07 15:21:58 +00:00
Matt Jankowski
1d51e10510
Consolidate JSON parsing in serializers specs ( #27693 )
2023-11-07 15:20:24 +00:00
Matt Jankowski
a688a9ed20
Use strings instead of numeric literals and remove rubocop:disable
in cache spec ( #27742 )
2023-11-07 15:20:00 +00:00
Matt Jankowski
dc0bf87090
Remove unused before block from settings/branding spec ( #27759 )
2023-11-07 15:19:17 +00:00
Matt Jankowski
45770c9306
Fix Performance/MapMethodChain
cop ( #27744 )
2023-11-07 13:01:09 +00:00
Matt Jankowski
49e2772064
Fix RSpec/MessageSpies
cop ( #27751 )
2023-11-07 09:46:28 +00:00
Matt Jankowski
2862ad701f
Stub controller methods and remove rubocop:disable
in captcha feature spec ( #27743 )
2023-11-07 09:15:30 +00:00
Matt Jankowski
cfa14ec6d1
Fix Lint/EmptyBlock
cop ( #27748 )
2023-11-07 09:11:04 +00:00
Matt Jankowski
b06284c572
Fix RSpec/HookArgument
cop ( #27747 )
2023-11-07 09:10:36 +00:00
Matt Jankowski
d6f50839e1
Fix RSpec/SpecFilePathFormat
cops ( #27730 )
2023-11-06 16:25:40 +00:00
Matt Jankowski
fe26f33e0a
Fix Rails/RedundantActiveRecordAllMethod
cop ( #26885 )
2023-11-06 15:51:52 +00:00
Matt Jankowski
949f5eb860
Fix RSpec/MetadataStyle
cop in spec/ ( #27729 )
2023-11-06 14:28:20 +00:00
Claire
c0989b78f8
Fix incoming status creation date not being restricted to standard ISO8601 ( #27655 )
2023-11-06 09:28:14 +00:00
Renaud Chaput
6712bf86cd
Fixes website not loading for unlogged users ( #27698 )
2023-11-04 21:52:56 +00:00
Claire
0337df3a42
Fix posts from threads received out-of-order sometimes not being inserted into timelines ( #27653 )
2023-11-02 14:58:37 +00:00
Claire
d649bbf28f
Add some more tests and clean up domain block controller ( #27469 )
2023-10-31 09:40:30 +00:00
Matt Jankowski
beee9ea991
Fix RSpec/LetSetup
cop in spec/controllers/admin area ( #27619 )
2023-10-31 08:22:19 +00:00
Matt Jankowski
eae5c7334a
Extract class from CSP configuration/initialization ( #26905 )
2023-10-27 16:20:40 +00:00
Matt Jankowski
2e6bf60f15
Use deliveries.size
in mailer-related examples in controller specs ( #27589 )
2023-10-27 15:33:52 +00:00
Claire
93e4cdc31b
Fix hashtag matching pattern matching some URLs ( #27584 )
2023-10-27 14:04:51 +00:00
Matt Jankowski
1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec ( #27486 )
2023-10-27 09:57:16 +00:00
Claire
bbf46cc418
Fix error and incorrect URLs in /api/v1/accounts/:id/featured_tags
for remote accounts ( #27459 )
2023-10-27 08:35:21 +00:00
Jeong Arm
8f998cd96a
Handle featured collections without items ( #27581 )
2023-10-27 02:36:22 +00:00
Claire
49b8433c56
Fix confusing screen when visiting a confirmation link for an already-confirmed email ( #27368 )
2023-10-25 21:33:44 +00:00
Claire
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
2023-10-24 19:59:19 +02:00
Claire
e25cc4deb7
Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Conflict due to glitch-soc having extra navigation items for its theming
system.
Ported upstream changes.
2023-10-24 19:31:14 +02:00
Claire
787d5ad386
Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Caused by a glitch-soc-only dependency (`exif-js`).
Kept it.
2023-10-24 19:05:18 +02:00
Claire
b0c76eaadd
Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream changed one import, close to a glitch-soc-only import to handle
different max character counts.
Ported upstream's change.
2023-10-24 18:41:20 +02:00
Matt Jankowski
e93a75f1a1
Rails 7.1 update ( #25963 )
2023-10-23 17:58:29 +00:00
Daniel M Brasil
26d2a2a0cc
Migrate to request specs in /api/v1/media
( #25543 )
2023-10-23 15:46:21 +00:00
Claire
bcae744275
Fix some link anchors being recognized as hashtags ( #27271 )
2023-10-23 14:19:38 +02:00
Matt Jankowski
b0213472df
Validate allowed schemes on preview card URLs ( #27485 )
2023-10-23 09:50:02 +02:00
Matt Jankowski
ab0fb81479
Configure brakeman to ignore url safe preview card urls ( #25883 )
2023-10-20 15:32:16 +02:00
Claire
13688539bc
Fix processing LDSigned activities from actors with unknown public keys ( #27474 )
2023-10-20 10:45:46 +02:00
Claire
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
Matt Jankowski
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning ( #25880 )
2023-10-19 17:25:54 +02:00
Matt Jankowski
bcd0171e5e
Fix Lint/UselessAssignment
cop ( #27472 )
2023-10-19 16:55:06 +02:00
Daniel M Brasil
7bc8f03162
Add test coverage for Mastodon::CLI::Accounts#migrate
( #25284 )
2023-10-19 16:11:15 +02:00
Matt Jankowski
a1b27d8b61
Fix Naming/VariableNumber
cop ( #27447 )
2023-10-18 14:26:22 +02:00
Emelia Smith
7c3fea7275
Feature: Allow token introspection without read scope ( #27142 )
2023-10-18 14:10:07 +02:00
Daniel M Brasil
091a21e1bc
Add test coverage for Mastodon::CLI::Accounts#prune
( #25204 )
2023-10-18 10:20:50 +02:00
Claire
e9dc30cdba
Fix duplicate github annotations for rspec failures ( #27450 )
2023-10-18 10:18:34 +02:00
Claire
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
2023-10-17 21:59:58 +02:00
Claire
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
2023-10-17 21:42:49 +02:00
Claire
b867d4581e
Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
Glitch-soc had a few extra lines in this file to account for a different
default setting. This file got replaced by
`spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
Add glitch-soc-only attribute `content_type`.
2023-10-17 21:35:07 +02:00
Claire
656a41db2a
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated its README, we have a completely different one.
Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
Upstream refactored stuff and the conflict is because of glitch-soc's theming
system.
Ported upstream changes while accounting for the different theming system.
2023-10-17 20:59:18 +02:00
Nick Schonning
5ef26d8fd5
Add RSpec GitHub annotations gem ( #24040 )
2023-10-17 18:28:09 +02:00
Matt Jankowski
71447ab19f
Fix Capybara/ClickLinkOrButtonStyle
cop in spec/features/admin area ( #27445 )
2023-10-17 16:57:19 +02:00
Matt Jankowski
2528a0721f
Update rubocop-capybara
to version 2.19.0 ( #26982 )
2023-10-17 16:10:50 +02:00
Claire
b34a2b1b33
Fix errors in CLI specs ( #27399 )
2023-10-17 15:30:12 +02:00
Victor Lee
c4bddc9855
Add spec for poll model ( #23399 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-17 14:56:24 +02:00
Matt Jankowski
12bb7be8b5
Spec speed ups on AccountsController
spec ( #25391 )
2023-10-17 13:32:10 +02:00
Matt Jankowski
d54fec24e5
Add coverage for CLI::PreviewCards#remove
command ( #27441 )
2023-10-17 13:06:16 +02:00
Matt Jankowski
19900f647e
Add coverage for UnreservedUsernameValidator
( #25590 )
2023-10-17 13:05:28 +02:00
Matt Jankowski
fc9ab61448
Expand spec coverage of CLI::Media
( #27437 )
2023-10-16 18:20:58 +02:00
Matt Jankowski
893b2f33fd
Extract shared example for cacheable response in specs ( #25388 )
2023-10-16 17:52:06 +02:00
Matt Jankowski
708299bb0d
Misc coverage improvements for Admin::
and Settings::
controllers ( #25346 )
2023-10-16 17:20:28 +02:00
Daniel M Brasil
e0ed0f8c7c
Migrate to request specs in /api/v1/notifications
( #25553 )
2023-10-16 17:15:24 +02:00
Daniel M Brasil
cafdaec6cf
Migrate to request specs in /api/v1/lists/:id/accounts
( #25468 )
2023-10-16 16:03:48 +02:00
Daniel M Brasil
8e6116503d
Migrate to request specs in /api/v1/blocks
( #25517 )
2023-10-16 16:03:35 +02:00
Daniel M Brasil
d9caa6ed24
Migrate to request specs in /api/v1/admin/accounts
( #25563 )
2023-10-16 15:49:12 +02:00
Matt Jankowski
f5bc1f20e2
Add coverage for ExistingUsernameValidator
( #25592 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-16 15:41:23 +02:00
Matt Jankowski
f8afa0f614
Remove unused stub json ld context ( #25454 )
2023-10-16 15:38:27 +02:00
Matt Jankowski
00e92b4038
Add coverage for CLI::Statuses
command ( #25321 )
2023-10-16 15:37:22 +02:00
Claire
299aa71c8f
Fix handling of inLanguage
attribute in preview card processing ( #27423 )
2023-10-16 15:24:14 +02:00
Daniel M Brasil
82beeb2f7e
Migrate to request specs in /api/v1/admin/trends/links
( #25739 )
2023-10-13 16:23:16 +02:00
Matt Jankowski
1b195ce115
Speed-up on Rack::Attack
spec ( #25542 )
2023-10-13 16:14:23 +02:00
Claire
71cfdd7865
Fix duplicate tests ( #27395 )
2023-10-13 16:10:43 +02:00
Matt Jankowski
cad8cc90ba
Speed-up on MoveWorker
spec ( #25528 )
2023-10-13 15:50:46 +02:00
Daniel M Brasil
058f73a4f5
Add request specs for /api/v1/reports
( #25475 )
2023-10-13 15:30:40 +02:00
Matt Jankowski
abf0e1fa39
Move SignedReqestHelpers
rspec config to separate file ( #25453 )
2023-10-13 15:19:40 +02:00
Daniel M Brasil
bc6cd27d9e
Migrate to request specs in /api/v1/followed_tags
( #25472 )
2023-10-13 14:43:50 +02:00
Matt Jankowski
fd9dea21d0
DB speedup in API::
controller/request specs ( #25516 )
2023-10-13 14:42:09 +02:00
Daniel M Brasil
ecdb31d479
Migrate to request specs in /api/v1/favourites
( #25518 )
2023-10-13 14:19:12 +02:00
Daniel M Brasil
7664e3b692
Migrate to request specs in /api/v1/statuses/:status_id/source
( #25634 )
2023-10-13 14:08:21 +02:00
Daniel M Brasil
4230d1ee0a
Migrate to request specs in /api/v1/timelines/tag/:hashtag
( #25797 )
2023-10-13 14:04:37 +02:00
KMY(雪あすか)
45bdd60f3c
Fix when unfollow a tag, my post also disappears from the home timeline ( #27391 )
2023-10-13 11:15:47 +02:00
Matt Jankowski
133f218a4d
Add system specs for admin area batch
actions ( #25027 )
2023-10-13 10:42:59 +02:00
Claire
3735e6f79d
Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream
2023-10-10 19:53:41 +02:00
Claire
27e84c0691
Fix duplicate reports being sent when reporting some remote posts ( #27355 )
2023-10-10 16:00:50 +02:00
Claire
53f5b27bd1
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
2023-10-08 17:30:48 +02:00
Claire
86c9c5afa0
Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
Upstream changed the order of Action Controller filters for web app
controllers.
Glitch-soc has an extra filter due to its theming system.
Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict due to an extra newline in glitch-soc.
Removed that newline and applied upstream's changes.
2023-10-08 17:26:43 +02:00
Claire
ac2370778a
Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream enforced a code style change and glitch-soc had a few different lines.
Applied upstream's code style to glitch-soc's changes.
2023-10-08 17:21:12 +02:00
Claire
74c27e33e3
Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream
2023-10-08 17:10:39 +02:00
Claire
3262d1f1b6
Fix incorrect serialization of regional languages in contentMap
( #27207 )
2023-10-06 17:46:04 +02:00
Claire
340c390849
Fix crash when filtering for “dormant” relationships ( #27306 )
2023-10-06 12:58:16 +02:00
Claire
40ba6e119b
Fix Vary headers not being set on some redirects ( #27272 )
2023-10-05 09:50:08 +02:00
Matt Jankowski
72cec47c13
Silence deprecation warning in CacheBuster spec ( #27264 )
2023-10-04 10:17:36 +02:00
gunchleoc
68ec1d180a
Fix language sorting in settings ( #27158 )
2023-10-04 09:23:50 +02:00
Matt Jankowski
c676bc91e9
Dont match mention in url query string ( #25656 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-03 17:01:45 +02:00
Claire
ceb365c419
Fix boosts of local users being filtered in account timelines ( #27204 )
2023-10-03 12:21:42 +02:00
Claire
f05985f8ec
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
2023-09-21 15:12:00 +02:00
Claire
828eebad48
Add hide_collections
, discoverable
and indexable
attributes to credentials API ( #26998 )
2023-09-20 18:25:16 +02:00
Claire
f546b0c999
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:07:29 +02:00
Claire
94893cf24f
Merge pull request from GHSA-hcqf-fw2r-52g4
...
* Revert "Fix request URL normalisation for bare domain and 8-bit characters (#26285 )"
This reverts commit 8891d8945d
.
* Revert "Do not normalize URL before fetching it (#26219 )"
This reverts commit fd284311e7
.
2023-09-19 16:52:52 +02:00
Claire
dfc05ec8df
Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream modified this file close to a line modified by glitch-soc to
disable the ARMv64 builder (as glitch-soc doesn't have one).
Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
Upstream modified this file close to lines changed by glitch-soc to
change the Docker image repositories used (only ghcr, and based on the
organization's name).
Ported upstream's changes.
2023-09-15 21:43:49 +02:00
Claire
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
Claire
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
Claire
5d8c65f2a7
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
2023-09-15 20:57:40 +02:00
Claire
6273416292
Fix post edits not being forwarded as expected ( #26936 )
2023-09-15 19:54:32 +02:00
Robert R George
20666482ef
Added admin api for managing tags ( #26872 )
2023-09-13 11:22:53 +02:00
jsgoldstein
4d9186a48c
Add search tests ( #26703 )
2023-09-08 16:17:55 +02:00
Eugen Rochko
3a679844e4
Fix account_id
, max_id
and min_id
params not working in search ( #26847 )
2023-09-08 14:25:00 +02:00
Claire
81caafbe84
Fix performances of profile directory ( #26842 )
2023-09-07 18:55:25 +02:00
Claire
355e3fb529
Simplify Account.by_recent_status
and Account.by_recent_sign_in
scopes ( #26840 )
2023-09-07 15:38:11 +02:00
Claire
1f99d86287
Fix blocked domain appears from account feed ( #26823 )
...
Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-09-06 21:04:48 +02:00
Claire
b83e487502
Fix moderator rights inconsistencies ( #26729 )
2023-09-06 16:40:19 +02:00
Claire
e66f961e05
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-04 18:27:46 +02:00
Eugen Rochko
ece1ff77d6
Add in:library
syntax to search ( #26760 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-09-04 17:20:35 +02:00
Christian Schmidt
ea31929776
Fix invalid Content-Type header for WebP images ( #26773 )
2023-09-04 09:46:33 +02:00
Claire
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
Claire
4adb12ca91
Fix test failures due to different default settings in glitch-soc
2023-09-02 14:24:47 +02:00
Claire
ac2dae0d11
Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-releases.yml`:
Upstream changed comments close to a line we modified to account for
different container image repositories.
Updated the comments as upstream did.
2023-09-02 13:50:16 +02:00
Claire
c8aa3d6d06
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
Claire
6b7c47311d
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +02:00