ea6c187fca
Fix media attachment order of remote posts ( #28469 )
2023-12-22 18:45:36 +01:00
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
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
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
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
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
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
2023-12-18 20:47:27 +01:00
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
2023-12-18 18:34:25 +01:00
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
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
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
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
8a3d8c6c14
Remove the `stub_stdout` wrapper around CLI specs ( #28340 )
2023-12-13 10:14:19 +00:00
b5a1013ae3
Combine `CLI::...` spec example subjects ( #28285 )
2023-12-11 10:23:45 +00:00
a3cbb4b2f1
Add spec for `CLI::Search#deploy` command ( #28272 )
2023-12-08 13:54:20 +00:00
8de86eabbf
Add spec for `CLI::Domains#crawl` command ( #28271 )
2023-12-08 09:51:57 +00:00
8d8ae05a18
Add spec coverage for `CLI::Media#lookup` command ( #28266 )
2023-12-07 15:27:41 +00:00
ad34d33bfd
Formalize some patterns in cli specs ( #28255 )
2023-12-07 13:49:14 +00:00
658ad7a6ca
Fix flaky tests related to file creation ( #28248 )
2023-12-06 22:22:25 +00:00
0e8ba19113
Add spec coverage for `CLI::Emoji` class ( #28182 )
2023-12-06 08:52:30 +00:00
b3b009e6aa
Add spec coverage for `CLI::EmailDomainBlocks` commands ( #28181 )
2023-12-04 09:44:54 +00:00
9603198982
Add spec coverage for `CLI::Domains#purge` command ( #28179 )
2023-12-04 09:09:05 +00:00
1bf2230fd1
Add spec coverage for `CLI::Upgrade#storage_schema` command ( #28180 )
2023-12-04 09:08:47 +00:00
1564799952
Add spec coverage for media CLI `refresh` command ( #28166 )
2023-12-01 14:18:45 +00:00
7753e5f715
Add shared example for CLI command specs ( #28165 )
2023-12-01 12:00:34 +00:00
92fa9b109f
Add spec coverage for media CLI usage command ( #28167 )
2023-12-01 11:56:47 +00:00
85662a5a57
Change `img-src` and `media-src` CSP directives to not include `https:` ( #28025 )
2023-11-30 13:47:01 +00:00
973597c6f1
Consolidate configuration of `Sidekiq::Testing.fake!` setup ( #28046 )
2023-11-23 09:43:43 +00:00
c260a68f54
Clean up some `Mastodon::CLI::Accounts` tests ( #27473 )
2023-11-20 10:46:02 +00:00
1fabf20a88
Reduce `.times` usage in `lib/mastodon/cli/accounts` spec ( #27944 )
2023-11-20 09:04:46 +00:00
b2c5b20ef2
Fix `RSpec/AnyInstance` cop ( #27810 )
2023-11-14 14:52:59 +00:00
4329616c53
Ignore block result of `send` method and remove `rubocop:disable` in deepl spec ( #27741 )
2023-11-08 14:43:17 +00:00
ee57bb4b44
Account statuses filter spec speedup ( #27674 )
2023-11-07 15:47:01 +00:00
370802ce48
Add coverage for `CLI::Maintenance#fix_duplicates` command ( #25252 )
2023-11-07 15:21:58 +00:00
49e2772064
Fix `RSpec/MessageSpies` cop ( #27751 )
2023-11-07 09:46:28 +00:00
cfa14ec6d1
Fix `Lint/EmptyBlock` cop ( #27748 )
2023-11-07 09:11:04 +00:00
d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops ( #27730 )
2023-11-06 16:25:40 +00:00
fe26f33e0a
Fix `Rails/RedundantActiveRecordAllMethod` cop ( #26885 )
2023-11-06 15:51:52 +00:00
949f5eb860
Fix `RSpec/MetadataStyle` cop in spec/ ( #27729 )
2023-11-06 14:28:20 +00:00
c0989b78f8
Fix incoming status creation date not being restricted to standard ISO8601 ( #27655 )
2023-11-06 09:28:14 +00:00
0337df3a42
Fix posts from threads received out-of-order sometimes not being inserted into timelines ( #27653 )
2023-11-02 14:58:37 +00:00
eae5c7334a
Extract class from CSP configuration/initialization ( #26905 )
2023-10-27 16:20:40 +00:00
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
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
e93a75f1a1
Rails 7.1 update ( #25963 )
2023-10-23 17:58:29 +00:00
13688539bc
Fix processing LDSigned activities from actors with unknown public keys ( #27474 )
2023-10-20 10:45:46 +02:00
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
7bc8f03162
Add test coverage for `Mastodon::CLI::Accounts#migrate` ( #25284 )
2023-10-19 16:11:15 +02:00
091a21e1bc
Add test coverage for `Mastodon::CLI::Accounts#prune` ( #25204 )
2023-10-18 10:20:50 +02:00
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
2023-10-17 21:59:58 +02:00
Claire
Matt Jankowski
Daniel M Brasil