2730 Commits (main)

Author	SHA1	Message	Date
Claire	1323dfac80	Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream	4 months ago
Claire	98b5f85f10	Rename and refactor `User#confirm!` to `User#mark_email_as_confirmed!` (#28735)	4 months ago
Claire	e621c1c44c	Fix registrations not checking MX records for email domain blocks requiring approval (#28608)	4 months ago
Matt Jankowski	a2f02a0775	Disable `Rails/SkipsModelValidations` cop (#28712)	4 months ago
Matt Jankowski	e72676e83a	Improve `api/v1/markers#create` performance against simultaneous requests (#28718)	4 months ago
Jeremy Kescher	3df2bc2caf	v4.3.0-alpha.0+glitch+cat+1.0.6	4 months ago
Claire	a3b6a85521	Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.	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
Matt Jankowski	a90696011e	Add coverage/bugfix for invalid appeal submission (#28703)	4 months ago
Matt Jankowski	7801db7ba4	Spec coverage for custom css endpoint (#28706)	4 months ago
Matt Jankowski	df9e220364	Add JS console errors check (#28682)	4 months ago
Matt Jankowski	cd37048439	Move followable_by coverage to suggestions (#28697)	4 months ago
Matt Jankowski	32eeca9c7b	Refresh instance counts in spec (fixes intermittent failure) (#28698)	4 months ago
Claire	15bc13c65b	Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream	4 months ago
Matt Jankowski	8b26614fa7	Combine results include check in spec/models/account (#28471)	4 months ago
Matt Jankowski	185c806d69	Extract spec helper for verifing to/from public AP collection namespace (#28472)	4 months ago
Matt Jankowski	2954279e9c	Remove double subject call in `api/v1/admin/trends/links/links` spec (#28695)	4 months ago
Matt Jankowski	95bd46d32a	Remove double subject call in `api/v1/admin/ip_blocks` spec (#28696)	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	630b245bb4	Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/settings/scoped_settings.rb`: Removed upstream, while glitch-soc had a change related to its theming system. Removed as well, as it's unused.	4 months ago
Matt Jankowski	4e08a4892f	Move streaming `around` config into manager class (#28684)	4 months ago
Matt Jankowski	87097a227c	Clean up `settings/featured_tags/index` view (#28688)	4 months ago
Matt Jankowski	55802242ce	Refactor login activity partial (remove inline ruby) (#28687)	4 months ago
Matt Jankowski	0a7cff53c2	Add coverage for `Account.followable_by` scope (#28689)	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
Claire	d7e13e2483	Fix potential redirection loop of streaming endpoint (#28665)	4 months ago
Matt Jankowski	8422b8ded0	Extract capybara config and improve headless_chrome driver config (#28681)	4 months ago
Matt Jankowski	543d7890fd	Use normalizes to prepare `User` values (#28650) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	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
Renaud Chaput	63d0b52cf3	Add a system spec for the `/share` endpoint (#28672)	4 months ago
Claire	10203bd57a	Clean up `Setting` model and remove dead code (#28661)	4 months ago
Jean Boussier	1781849884	Inline what remains of the rails-settings-cached gem (#28618) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	4 months ago
Matt Jankowski	5dc634796a	Misc coverage improvements re: sidekiq/inline (#28651)	4 months ago
Matt Jankowski	e677eb164c	Remove unused `Announcement#time_range?` (#28648)	4 months ago
Matt Jankowski	3e43cd095c	Remove unused scope `Announcement.without_muted` (#28645)	4 months ago
Claire	157fc69954	Make request_pool_spec tests more robust (#28610)	4 months ago
Matt Jankowski	aa6d07dbd9	Use normalizes to prepare CustomEmoji `domain` value (#28624)	4 months ago
Matt Jankowski	832b92ac3e	Add attachment check to spec/service/suspend_account_service spec (#28619)	4 months ago
Matt Jankowski	12bed81187	Add validation specs to `CustomFilter` model (#28600)	4 months ago
Claire	6ad0fb5a77	Fix NULL MX handling and tighten DNS resolving specs (#28607)	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
Matt Jankowski	f06c1f1552	Fix `Capybara/ClickLinkOrButtonStyle` cop in spec/features (#28576)	5 months ago
Claire	dfdadb92e8	Add ability to require approval when users sign up using specific email domains (#28468)	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	9d9008666b	Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream	5 months ago
Claire	092bb8a27a	Fix Mastodon not correctly processing HTTP Signatures with query strings (#28476)	5 months ago
Claire	bd415af9a1	Change streaming API host to not be overridden to localhost in development mode (#28557)	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
Essem	6ae86f40d1	Add support for emoji reactions ... Squashed, modified, and rebased from glitch-soc/mastodon#2221. Co-authored-by: fef <owo@fef.moe> Co-authored-by: Jeremy Kescher <jeremy@kescher.at> Co-authored-by: neatchee <neatchee@gmail.com> Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com> Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>	5 months ago
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	5 months ago
Claire	19e14654cc	Reduce CSP configuration changes with upstream (#2536)	5 months ago
Claire	a2624ff739	Convert signature verification specs to request specs (#28443)	5 months ago
Claire	ea6c187fca	Fix media attachment order of remote posts (#28469)	5 months ago
Matt Jankowski	bb8077e784	Fix `RSpec/LetSetup` cop in models/account_status_cleanup_policy (#28470)	5 months ago
Claire	2bf84b93d4	Fix media attachment order of remote posts (#28469)	5 months ago
Matt Jankowski	a4d49c236d	Fix `RSpec/LetSetup` cop in ap/fetch_featured_collection_service (#28461)	5 months ago
Matt Jankowski	e6e217fedd	Clean up `tagged_with_*` Status specs, fix `RSpec/LetSetup` cop (#28462)	5 months ago
Matt Jankowski	513d35969e	Fix `RSpec/LetSetup` cop in auth controller specs (#28464)	5 months ago
Claire	92aa6e2ec9	Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream	5 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.	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	9251779d75	Fix `RSpec/LetSetup` cop in spec/services (#28459)	5 months ago
Matt Jankowski	efd16f3c2c	Clean up of `RSpec/LetSetup` within `spec/services/activitypub` (#28445)	5 months ago
Matt Jankowski	c99f88e1a8	Clean up of `RSpec/LetSetup` within `spec/lib` (#28447)	5 months ago
Matt Jankowski	cd64a5b2ec	Clean up of `RSpec/LetSetup` within `api/` (#28448)	5 months ago
Matt Jankowski	f32d672d2f	Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446)	5 months ago
Matt Jankowski	c753b1ad35	Clean up of `RSpec/LetSetup` within `spec/models` (#28444)	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	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.	5 months ago
Claire	8a5f2442cc	Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream	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	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.	5 months ago
Claire	6c00d5b0c4	Fix test failure caused by glitch-soc changes	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
Claire	d288a6162a	Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream	5 months ago
Claire	b24f676cf1	Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream	5 months ago
Claire	3ad92e8d0d	Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream	5 months ago
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.	5 months ago
Claire	6fed0fcbaa	Remove unneeded settings cleanup from specs (#28425)	5 months ago
Matt Jankowski	c7c727994a	Add spec for `CLI::Maintenance#fix_duplicates` (#28326)	5 months ago
Eugen Rochko	b5ac61b2c5	Change algorithm of follow recommendations (#28314) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	5 months ago
Matt Jankowski	c28976d89e	Handle negative offset param in `api/v2/search` (#28282)	5 months ago
Claire	a111fd7a0b	Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream	5 months ago
Claire	d6ad9d351e	Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream	5 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.	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