b8f476256e
Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream
2024-03-15 22:48:04 +01:00
4f4132f1a1
Add diagnostic message for failure during CLI search deploy ( #29462 )
2024-03-15 14:26:23 +00:00
e91ede5be6
Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream
2024-03-14 17:27:16 +01:00
681a89f684
Readability clean up in `ImportVacuum` spec ( #28955 )
2024-03-14 09:24:00 +00:00
42875fee52
Add coverage for bad args/options in `CLI::Domains#purge` ( #29578 )
2024-03-14 08:58:53 +00:00
65ca37bbaa
Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Conflict due to glitch-soc having factored the file differently.
Ported upstream's changes.
2024-03-13 20:14:18 +01:00
06881a8669
Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream
2024-03-13 19:16:47 +01:00
6262ceeb70
Fix `RSpec/DescribedClass` cop ( #29472 )
2024-03-13 15:42:39 +00:00
8349b45d60
Accept extra args that we wont verify in `ap/activity/add_spec` ( #29005 )
2024-03-13 08:46:11 +00:00
a5127d0ef8
Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
glitch-soc has an extra `:destroy` action on notifications for historical reasons.
Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01:00
a7284690fc
Add coverage for admin/metrics base classes, simplify subclass generation ( #29527 )
2024-03-11 09:16:19 +00:00
ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
2024-02-24 14:46:14 +01:00
c297d999ba
Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream
2024-02-24 14:02:01 +01:00
20615a516d
Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream
2024-02-24 13:53:59 +01:00
6c1b6194f7
Merge pull request from GHSA-jhrq-qvrm-qr36
...
* Fix insufficient Content-Type checking of fetched ActivityStreams objects
* Allow JSON-LD documents with multiple profiles
2024-02-16 12:17:15 +01:00
9fee5e8526
Merge pull request from GHSA-jhrq-qvrm-qr36
...
* Fix insufficient Content-Type checking of fetched ActivityStreams objects
* Allow JSON-LD documents with multiple profiles
2024-02-16 11:56:12 +01:00
ed4939296a
Reduce `RSpec/MultipleExpectations` in ap/activity/create spec ( #29224 )
2024-02-16 07:43:00 +00:00
15437e4ad9
Add `context` and `before` to lengthy tag manager spec examples ( #29129 )
2024-02-08 10:03:04 +00:00
eff447a455
Rewrite signature verification using regexps and `StringScanner` ( #29133 )
2024-02-07 17:24:42 +00:00
95da28d201
Add common `ThreadingHelper` module for specs ( #29116 )
2024-02-07 14:53:29 +00:00
7efc33b909
Move HTTP Signature parsing code to its own class ( #28932 )
2024-02-07 13:35:37 +00:00
ff58ec0103
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:57:08 +01:00
1726085db5
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:56:46 +01:00
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
5fbdb2055b
Combine repeated `subject` in `cli/accounts` spec shared example ( #28942 )
2024-01-26 16:35:19 +00:00
1a30a517d6
Combine repeated subjects in link details extractor spec ( #28941 )
2024-01-26 16:31:07 +00:00
0e0a94f483
Handle CLI failure exit status at the top-level script ( #28322 )
2024-01-26 08:53:44 +00:00
087415d0fe
Add tests for processing statuses using bearcap URIs ( #28904 )
2024-01-25 11:13:36 +00:00
c59fb65ddc
Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
2024-01-17 18:32:15 +01:00
9a475ea8b3
Finish up the CLI spec area pattern adoption for `CLI::Accounts#refresh` specs ( #28764 )
2024-01-17 13:38:37 +00:00
464051c2d2
Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream
2024-01-15 20:06:31 +01:00
2c05b8a60d
Fix Undo Announce activity is not sent, when not followed by the reblogged post author ( #18482 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-12 15:58:28 +00:00
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
2024-01-11 13:24:20 +01:00
63acdebc5d
Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because of a code style fix, while some changed lines are
absent from glitch-soc.
Ignored the deleted lines.
2024-01-11 13:17:13 +01:00
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
2024-01-10 18:41:04 +01:00
0b2c7cdb02
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
00341c70ff
Use Sidekiq `fake!` instead of `inline!` in specs ( #25369 )
2024-01-10 11:06:58 +00:00
742d8d30e2
Add coverage for `--days` option to CLI `media refresh` command ( #28669 )
2024-01-10 09:36:12 +00:00
157fc69954
Make request_pool_spec tests more robust ( #28610 )
2024-01-08 12:29:05 +00:00
5f4643b895
Add `PAPERCLIP_ROOT_URL` to Content-Security-Policy when used ( #28561 )
2024-01-05 10:45:36 +00:00
964a0ecf37
Add sleep statement to nudge thread scheduler in request pool spec ( #28596 )
2024-01-04 16:55:00 +00:00
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
2024-01-03 20:52:19 +01:00
f92d8c654d
Standardize on Thor methods in CLI classes ( #28566 )
2024-01-03 15:08:08 +00:00
5c769de096
Add spec coverage for `CLI::Media#remove_orphans` command ( #28267 )
2024-01-03 14:12:56 +00:00
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
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
2023-12-28 16:57:10 +01:00
ea6c187fca
Fix media attachment order of remote posts ( #28469 )
2023-12-22 18:45:36 +01:00
2bf84b93d4
Fix media attachment order of remote posts ( #28469 )
2023-12-22 15:10:39 +00: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
Claire
Matt Jankowski
MitarashiDango