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
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
1 year ago
b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
1 year ago
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
c22fc2fa80
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
1 year ago
b0780cfeed
Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )
1 year ago
8884d1ece0
Add support for importing lists ( #25203 )
1 year ago
2a353200ad
Add test coverage for `Mastodon::CLI::Accounts#rotate` ( #25212 )
1 year ago
942d850b0a
Allow carets in URL search params ( #25216 )
1 year ago
f906e21a4f
Add test coverage for `Mastodon::CLI::Accounts#refresh` ( #25196 )
1 year ago
f84037ae2b
Remove unused #hash_to_object method in SettingsHelper ( #25213 )
1 year ago
e9385e93e9
Add a confirmation screen when suspending a domain ( #25144 )
1 year ago
b922ad7a1b
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
1 year ago
69057467cb
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
b0104e4c33
Silence output to stdout during cli specs ( #25211 )
1 year ago
3c41547f49
Add test coverage for `Mastodon::CLI::Accounts#backup` ( #25163 )
1 year ago
8b1bfaed3e
Add specs for admin/webhooks CRUD actions ( #25133 )
1 year ago
665bb237a8
Increase spec coverage for controllers - admin/ip_blocks, admin/relays, admin/rules ( #25192 )
1 year ago
bf9a7ce8e8
Add test coverage for `Mastodon::CLI::Accounts#unfollow` ( #25162 )
1 year ago
dbc44be0ca
Add test coverage for `Mastodon::CLI::Accounts#follow` ( #25161 )
1 year ago
3d253b9830
Add test coverage for `Mastodon::CLI::Accounts#approve` ( #25160 )
1 year ago
bbbcdc083f
Add test coverage for `Mastodon::CLI::Accounts#delete` ( #25146 )
1 year ago
bdc7548652
Add test coverage for `Mastodon::CLI::Accounts#modify` ( #25145 )
1 year ago
11b8336418
Add test coverage for `Mastodon::CLI::Accounts#create` ( #25143 )
1 year ago
0669783da8
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
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
6dbd44faea
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
1 year ago
0f2c16ac4b
Fix RSpec/NoExpectationExample cop ( #25103 )
1 year ago
61f6cd45e3
Fix glitch-soc-only tests being broken because of test refactor
1 year ago
e2ab9d4dad
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
1 year ago
2e02d03524
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
1 year ago
f959f6cdbb
Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream
1 year ago
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
384345b0de
Add CLI Base class for command line code ( #25106 )
2 years ago
d2e5430d4a
Fix RSpec/ExpectChange cop ( #25101 )
2 years ago
b896b16cb3
Fix RSpec/PredicateMatcher cop ( #25102 )
2 years ago
778e4a7bf7
Fix RSpec/ExpectInHook cop ( #25100 )
2 years ago
b6b4ea4ca5
Move the mastodon/*_cli files to mastodon/cli/* ( #24139 )
2 years ago
c9f980b268
Add request spec for backups download ( #25099 )
2 years ago
e387175fc9
Fix RSpec/RepeatedExample cop ( #24849 )
2 years ago
9f5deb310b
Fix Performance/MapCompact cop ( #24797 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
2877c80dbc
Add specs for admin/announcements CRUD actions ( #25077 )
2 years ago
b473df9a14
Improve test coverage for `/api/v1/featured_tags` ( #25076 )
2 years ago
2a61f14753
Fix account confirmation flow not returning to app after captcha validation ( #25057 )
2 years ago
4a22e72b9b
Improve test coverage for `/api/v1/admin/canonical_email_blocks` ( #24985 )
2 years ago
ce8b5899ae
Fix POST `/api/v1/admin/domain_allows` returning 200 when no domain is specified ( #24958 )
2 years ago
e328ab7e5a
Implement pending specs for StatusesController ( #23969 )
2 years ago
f3feb4c891
Improve test coverage for `/api/v1/admin/email_domain_blocks` ( #25017 )
2 years ago
19f9098551
Allow reports with long comments from remote instances, but truncate ( #25028 )
2 years ago
d51464283c
Improve test coverage for `/api/v1/admin/ip_blocks_controller` ( #25031 )
2 years ago
Claire
Renaud Chaput
Daniel M Brasil
Matt Jankowski
Christian Schmidt
Emelia Smith