2146 Commits (83ae40e192db86a72a6092c8b99d5f3594d93ca6)

Author	SHA1	Message	Date
Claire	c48ec9cb8c	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.	1 year ago
Claire	d8b0a732aa	Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components.	1 year ago
Claire	734e186717	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/load_locale.js`: The file moved to `app/javascript/mastodon/locales/load_locale.ts`. Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`. - `app/javascript/mastodon/locales/index.js`: The file moved to `app/javascript/mastodon/locales/index.ts`. Did *not* port the changes as I want to try something a bit different.	1 year ago
Claire	aa57f7e3e2	Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream	1 year ago
Claire	b27a9a5903	Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream	1 year ago
Claire	93c714417f	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream changed various script definitions in lines surrounding the one for `i18n:extract`, which had glitch-soc-specific changes. Updated the scripts as upstream did, while keeping our changes to `i18n:extract`.	1 year ago
Matt Jankowski	6c0e3f490a	Fix RSpec/MissingExampleGroupArgument cop (#25310)	1 year ago
Matt Jankowski	b74c3cd708	Fix `RSpec/DescribedClass` cop missed items (#25309)	1 year ago
Matt Jankowski	c42591356d	Fix `RSpec/DescribedClass` cop (#25104)	1 year ago
Matt Jankowski	1e243e2df7	Misc spec coverage for `Admin::` area controllers (#25282)	1 year ago
Daniel M Brasil	eb6f8181e1	Add test coverage for `Mastodon::CLI::Accounts#reset_relationships` (#25194)	1 year ago
Matt Jankowski	b22bfae4f9	Add coverage for `DomainBlock#public_domain` method (#25283)	1 year ago
Eugen Rochko	4eda233e09	Add webhook templating (#23289) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Matt Jankowski	af135bddd0	Update `Admin::Metrics::Measure` classes for Rails 7 (#25236)	1 year ago
Matt Jankowski	3b21c13dcc	Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes (#25277)	1 year ago
Daniel M Brasil	70cd2d6000	Add test coverage for `Mastodon::CLI::Accounts#cull` (#25250)	1 year ago
Claire	c22fc2fa80	Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Took upstream's changes.	1 year ago
Darius Kazemi	bacb674921	Add exclusive lists (#22048) ... Co-authored-by: Liam Cooke <liam@liamcooke.com> Co-authored-by: John Holdun <john@johnholdun.com> Co-authored-by: Effy Elden <effy@effy.space> Co-authored-by: Lina Reyne <git@lina.pizza> Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Matt Jankowski	5c87c66504	Add coverage for CLI::CanonicalEmailBlocks command (#25239)	1 year ago
Daniel M Brasil	03a707f6a6	Add test coverage for `Mastodon::CLI::Accounts#merge` (#25199)	1 year ago
Renaud Chaput	b0780cfeed	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	1 year ago
Claire	8884d1ece0	Add support for importing lists (#25203)	1 year ago
Daniel M Brasil	2a353200ad	Add test coverage for `Mastodon::CLI::Accounts#rotate` (#25212)	1 year ago
Renaud Chaput	942d850b0a	Allow carets in URL search params (#25216)	1 year ago
Daniel M Brasil	f906e21a4f	Add test coverage for `Mastodon::CLI::Accounts#refresh` (#25196)	1 year ago
Matt Jankowski	f84037ae2b	Remove unused #hash_to_object method in SettingsHelper (#25213)	1 year ago
Claire	e9385e93e9	Add a confirmation screen when suspending a domain (#25144)	1 year ago
Claire	b922ad7a1b	Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component (#25018)	1 year ago
Christian Schmidt	69057467cb	Translate CW, poll options and media descriptions (#24175) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Matt Jankowski	b0104e4c33	Silence output to stdout during cli specs (#25211)	1 year ago
Daniel M Brasil	3c41547f49	Add test coverage for `Mastodon::CLI::Accounts#backup` (#25163)	1 year ago
Matt Jankowski	8b1bfaed3e	Add specs for admin/webhooks CRUD actions (#25133)	1 year ago
Matt Jankowski	665bb237a8	Increase spec coverage for controllers - admin/ip_blocks, admin/relays, admin/rules (#25192)	1 year ago
Daniel M Brasil	bf9a7ce8e8	Add test coverage for `Mastodon::CLI::Accounts#unfollow` (#25162)	1 year ago
Daniel M Brasil	dbc44be0ca	Add test coverage for `Mastodon::CLI::Accounts#follow` (#25161)	1 year ago
Daniel M Brasil	3d253b9830	Add test coverage for `Mastodon::CLI::Accounts#approve` (#25160)	1 year ago
Daniel M Brasil	bbbcdc083f	Add test coverage for `Mastodon::CLI::Accounts#delete` (#25146)	1 year ago
Daniel M Brasil	bdc7548652	Add test coverage for `Mastodon::CLI::Accounts#modify` (#25145)	1 year ago
Daniel M Brasil	11b8336418	Add test coverage for `Mastodon::CLI::Accounts#create` (#25143)	1 year ago
Claire	0669783da8	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	0e7466717f	Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: We removed it from glitch-soc. Keep it deleted.	1 year ago
Claire	6dbd44faea	Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream	1 year ago
Matt Jankowski	0f2c16ac4b	Fix RSpec/NoExpectationExample cop (#25103)	1 year ago
Claire	61f6cd45e3	Fix glitch-soc-only tests being broken because of test refactor	1 year ago
Claire	e2ab9d4dad	Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream	1 year ago
Claire	2e02d03524	Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	1 year ago
Claire	f959f6cdbb	Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream	1 year ago
Claire	b735954971	Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc.	1 year ago
Matt Jankowski	384345b0de	Add CLI Base class for command line code (#25106)	2 years ago
Matt Jankowski	d2e5430d4a	Fix RSpec/ExpectChange cop (#25101)	2 years ago