183 Commits (cc363629bea40d738b41608152b9d88b1a509621)

Author	SHA1	Message	Date
Claire	15bc13c65b	Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream	8 months ago
Matt Jankowski	2954279e9c	Remove double subject call in `api/v1/admin/trends/links/links` spec (#28695)	8 months ago
Matt Jankowski	95bd46d32a	Remove double subject call in `api/v1/admin/ip_blocks` spec (#28696)	8 months ago
Claire	23d8bd8ce1	Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream	8 months ago
Matt Jankowski	00341c70ff	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	8 months ago
Claire	9d9008666b	Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream	9 months ago
Claire	092bb8a27a	Fix Mastodon not correctly processing HTTP Signatures with query strings (#28476)	9 months ago
Claire	bd415af9a1	Change streaming API host to not be overridden to localhost in development mode (#28557)	9 months ago
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	9 months ago
Claire	19e14654cc	Reduce CSP configuration changes with upstream (#2536)	9 months ago
Claire	a2624ff739	Convert signature verification specs to request specs (#28443)	9 months ago
Claire	92aa6e2ec9	Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream	9 months ago
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.	9 months ago
Claire	f5b7307890	Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines.	9 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.	9 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.	9 months ago
Claire	8a5f2442cc	Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream	9 months ago
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.	9 months ago
Claire	6c00d5b0c4	Fix test failure caused by glitch-soc changes	9 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.	9 months ago
Claire	d288a6162a	Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream	9 months ago
Claire	b24f676cf1	Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream	9 months ago
Claire	3ad92e8d0d	Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream	9 months ago
Claire	6fed0fcbaa	Remove unneeded settings cleanup from specs (#28425)	9 months ago
Eugen Rochko	b5ac61b2c5	Change algorithm of follow recommendations (#28314) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	9 months ago
Matt Jankowski	c28976d89e	Handle negative offset param in `api/v2/search` (#28282)	9 months ago
Claire	a111fd7a0b	Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream	9 months ago
Claire	d6ad9d351e	Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream	9 months ago
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.	9 months ago
Claire	46ddaffd40	Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream	9 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.	9 months ago
Matt Jankowski	1820bad646	Fix `Performance/StringIdentifierArgument` cop (#28399)	9 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.	9 months ago
Matt Jankowski	adbfd40a1b	Convert `api/v1/directories` controller spec to request spec (#28356)	9 months ago
Matt Jankowski	28e1a7a394	Improve spec coverage for `models/announcement` class (#28350)	9 months ago
Matt Jankowski	0e4233de9d	Controller spec to request spec: `api/v2/suggestions` (#28297)	9 months ago
Matt Jankowski	0c64092500	Controller spec to request spec: `api/v1/accounts/search` (#28299)	9 months ago
Matt Jankowski	16ede59d0a	Controller spec to request spec: `api/v1/featured_tags/suggestions` (#28298)	9 months ago
Matt Jankowski	809506bdd4	Controller spec to request spec: `api/v1/accounts/pins` (#28300)	9 months ago
Matt Jankowski	94cc707ab3	Controller spec to request spec: `api/v1/accounts/notes` (#28301)	9 months ago
Matt Jankowski	e544b6df42	Controller spec to request spec: `api/v1/accounts/lookup` (#28302)	9 months ago
Matt Jankowski	a968898dc7	Controller spec to request spec: `api/v1/accounts/lists` (#28303)	9 months ago
Matt Jankowski	8f94502e7d	Controller spec to request spec: `api/v1/accounts/identify_proofs` (#28304)	9 months ago
Matt Jankowski	78347d2556	Controller spec to request spec: `api/v1/accounts/familiar_followers` (#28305)	9 months ago
Matt Jankowski	11d2bd9716	Fix intermittent failure from unspecified order in `api/v1/accounts/relationships` spec (#28306)	9 months ago
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`	9 months ago
Matt Jankowski	7e514688b3	Convert `api/v2/search` controller spec to request spec (#28269)	10 months ago
Matt Jankowski	71e5a16eba	Remove triple subject call in `api/v1/lists` spec (#28210)	10 months ago
Matt Jankowski	cca19f5fbb	Use the `Admin::ActionLog` fabricator in admin/action_logs spec (#28194)	10 months ago
Matt Jankowski	0530ce5e95	Convert accounts controller spec to request spec (#28126)	10 months ago