628 Commits (main)

Author	SHA1	Message	Date
Jeremy Kescher	ce878a78bb	Merge branch 'glitch-soc' into develop	3 months ago
Claire	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	3 months ago
Jeremy Kescher	c7e37c256e	Merge branch 'glitch-soc' into develop	4 months ago
Claire	ff58ec0103	Merge pull request from GHSA-3fjr-858r-92rw ... * Fix insufficient origin validation * Bump version to 4.3.0-alpha.1	4 months ago
Jeremy Kescher	c2c2afc294	Merge branch 'glitch-soc' into develop	4 months ago
Claire	5fa2821853	Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream	4 months ago
Claire	087415d0fe	Add tests for processing statuses using bearcap URIs (#28904)	4 months ago
Jeremy Kescher	93ae46fa14	Merge branch 'glitch-soc' into develop	4 months ago
Jeremy Kescher	5d4cfe4cd8	Merge branch 'glitch-soc' into develop	4 months ago
Claire	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.	4 months ago
Matt Jankowski	9a475ea8b3	Finish up the CLI spec area pattern adoption for `CLI::Accounts#refresh` specs (#28764)	4 months ago
Claire	464051c2d2	Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream	4 months ago
Jeremy Kescher	c677b8de19	v4.3.0-alpha.0+glitch+cat+1.0.5	4 months ago
MitarashiDango	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>	4 months ago
Claire	23d8bd8ce1	Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream	4 months ago
Claire	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.	4 months ago
Claire	47d213e701	Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream	4 months ago
Claire	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`.	4 months ago
Matt Jankowski	00341c70ff	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	4 months ago
Matt Jankowski	742d8d30e2	Add coverage for `--days` option to CLI `media refresh` command (#28669)	4 months ago
Claire	157fc69954	Make request_pool_spec tests more robust (#28610)	4 months ago
Claire	5f4643b895	Add `PAPERCLIP_ROOT_URL` to Content-Security-Policy when used (#28561)	4 months ago
Jeremy Kescher	3b9a52aab6	Merge branch 'glitch-soc' into develop	5 months ago
Matt Jankowski	964a0ecf37	Add sleep statement to nudge thread scheduler in request pool spec (#28596)	5 months ago
Claire	0b5783f3f1	Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream	5 months ago
Matt Jankowski	f92d8c654d	Standardize on Thor methods in CLI classes (#28566)	5 months ago
Matt Jankowski	5c769de096	Add spec coverage for `CLI::Media#remove_orphans` command (#28267)	5 months ago
Matt Jankowski	74a0d81e90	Add coverage for CLI `self-destruct` command (#28565) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	5 months ago
Claire	b3d871d3a4	Add `PAPERCLIP_ROOT_URL` to Content-Security-Policy when used ... (backports https://github.com/mastodon/mastodon/pull/28561)	5 months ago
Jeremy Kescher	5be3fb3d66	Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions	5 months ago
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	5 months ago
Claire	ea6c187fca	Fix media attachment order of remote posts (#28469)	5 months ago
Claire	2bf84b93d4	Fix media attachment order of remote posts (#28469)	5 months ago
Claire	f5b7307890	Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines.	5 months ago
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.	5 months ago
Matt Jankowski	c99f88e1a8	Clean up of `RSpec/LetSetup` within `spec/lib` (#28447)	5 months ago
Matt Jankowski	2463b53363	More duplicates in cli maintenance spec, misc bug fixes (#28449)	5 months ago
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.	5 months ago
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.	5 months ago
Matt Jankowski	961d65aba6	Add coverage to CLI Maintenance for duplicate users on `confirmation_token` and `reset_password_token` values (#28434)	5 months ago
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.	5 months ago
Matt Jankowski	c7c727994a	Add spec for `CLI::Maintenance#fix_duplicates` (#28326)	5 months ago
Claire	a111fd7a0b	Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream	5 months ago
Claire	46ddaffd40	Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream	5 months ago
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.	5 months ago
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.	5 months ago
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.	5 months ago
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.	5 months ago
Matt Jankowski	8a3d8c6c14	Remove the `stub_stdout` wrapper around CLI specs (#28340)	5 months ago
Matt Jankowski	b5a1013ae3	Combine `CLI::...` spec example subjects (#28285)	5 months ago