766 Commits (main)

Author	SHA1	Message	Date
Jeremy Kescher	1c9291adcd	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/styles/components/accounts.scss # app/javascript/flavours/glitch/styles/components/status.scss	3 months ago
Claire	53b73ed6a2	Merge pull request from GHSA-vm39-j3vx-pch3 ... * Prevent different identities from a same SSO provider from accessing a same account * Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true` * Rename methods to avoid confusion between OAuth and OmniAuth	3 months ago
Emelia Smith	436419cc2f	Merge pull request from GHSA-7w3c-p9j8-mq3x ... * Ensure destruction of OAuth Applications notifies streaming Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens. * Ensure password resets revoke access to Streaming API * Improve performance of deleting OAuth tokens --------- Co-authored-by: Claire <claire.github-309c@sitedethib.com>	3 months ago
Jeremy Kescher	bf4d613731	Merge branch 'glitch-soc' into develop	4 months ago
Jeremy Kescher	c2c2afc294	Merge branch 'glitch-soc' into develop	4 months ago
Claire	bf153b384b	Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/auth/passwords_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict.	4 months ago
Claire	5fa2821853	Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream	4 months ago
Matt Jankowski	42ab855b23	Add specs for `Instance` model scopes and add `with_domain_follows` scope (#28767)	4 months ago
Matt Jankowski	2866106ec1	Reduce factory creation in `spec/models/account_statuses_cleanup_policy` (#28361)	4 months ago
Matt Jankowski	6b6586f5d0	Add `CustomFilterKeyword#to_regex` method (#28893)	4 months ago
Claire	22cfab0ebf	Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream ... Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes.	4 months ago
Matt Jankowski	b0207d7757	Add coverage for `Tag.recently_used` scope (#28850)	4 months ago
Claire	102eff7c05	Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream	4 months ago
Claire	0700eb58bc	Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream	4 months ago
Matt Jankowski	18004bf227	Add `Account.matches_uri_prefix` scope and use in activitypub/followers_synchronizations controller (#28820)	4 months ago
Matt Jankowski	1480573c83	Add `Account.auditable` scope, fix N+1 in admin/action_logs#index (#28812)	4 months ago
Jeremy Kescher	93ae46fa14	Merge branch 'glitch-soc' into develop	4 months ago
Claire	528a8fa495	Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream	4 months ago
Matt Jankowski	d0b3bc23d7	Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock (#28803)	4 months ago
Matt Jankowski	07e10e3747	Combine assertions about same setup in `Account#suspend!` spec (#28787)	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	1b0cb3b54d	Announcement reactions query spec improvement and refactor (#28768)	4 months ago
Claire	278597c161	Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' 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
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
Matt Jankowski	cd37048439	Move followable_by coverage to suggestions (#28697)	4 months ago
Matt Jankowski	8b26614fa7	Combine results include check in spec/models/account (#28471)	4 months ago
Claire	23d8bd8ce1	Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream	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	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
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
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
Matt Jankowski	aa6d07dbd9	Use normalizes to prepare CustomEmoji `domain` value (#28624)	4 months ago
Matt Jankowski	12bed81187	Add validation specs to `CustomFilter` model (#28600)	4 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
Matt Jankowski	bb8077e784	Fix `RSpec/LetSetup` cop in models/account_status_cleanup_policy (#28470)	5 months ago
Matt Jankowski	e6e217fedd	Clean up `tagged_with_*` Status specs, fix `RSpec/LetSetup` cop (#28462)	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